diff --git a/tools/test-runner b/tools/test-runner
index a7eaf5b6..54985b7a 100755
--- a/tools/test-runner
+++ b/tools/test-runner
@@ -751,10 +751,12 @@ class Namespace:
 			try:
 				ret = func(*args)
 				if ret:
-					GLib.source_remove(timeout)
+					if not done.value:
+						GLib.source_remove(timeout)
 					return ret
 			except Exception as e:
-				GLib.source_remove(timeout)
+				if not done.value:
+					GLib.source_remove(timeout)
 				raise e
 
 			sleep(0.1)