diff --git a/tools/test-runner.c b/tools/test-runner.c
index ee077eb..a17ec59 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -732,17 +732,8 @@ start_next:
 			monitor_pid = -1;
 		}
 
-		if (corpse == pid) {
-			if (!run_auto) {
-				if (daemon_pid > 0)
-					kill(daemon_pid, SIGTERM);
-				if (dbus_pid > 0)
-					kill(dbus_pid, SIGTERM);
-				if (monitor_pid > 0)
-					kill(monitor_pid, SIGTERM);
-			}
+		if (corpse == pid)
 			break;
-		}
 	}
 
 	if (run_auto) {
@@ -750,6 +741,15 @@ start_next:
 		goto start_next;
 	}
 
+	if (daemon_pid > 0)
+		kill(daemon_pid, SIGTERM);
+
+	if (dbus_pid > 0)
+		kill(dbus_pid, SIGTERM);
+
+	if (monitor_pid > 0)
+		kill(monitor_pid, SIGTERM);
+
 	if (serial_fd >= 0) {
 		close(serial_fd);
 		serial_fd = -1;