diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
index f90d9f928..aa95b3bc8 100644
--- a/src/tests/test-runner.c
+++ b/src/tests/test-runner.c
@@ -385,6 +385,9 @@ test_case_do (TestCase *test,
                            argc == 3 ? argv[2] : NULL,
                            NULL))
         return FALSE;
+
+      if (!test_client_wait (client, error))
+        return FALSE;
     }
   else if (strcmp (argv[0], "set_parent") == 0 ||
            strcmp (argv[0], "set_parent_exported") == 0)