diff --git a/collects/tests/framework/test-suite-utils.ss b/collects/tests/framework/test-suite-utils.ss
index 8b6ccc504b..704d833a07 100644
--- a/collects/tests/framework/test-suite-utils.ss
+++ b/collects/tests/framework/test-suite-utils.ss
@@ -297,6 +297,7 @@
                 (and win
                      (string=? (send win get-label) ,name)))])
     (if eventspace
-        `(parameterize ([current-eventspace ,eventspace])
-           ,exp)
+        (wait-for
+         `(parameterize ([current-eventspace ,eventspace])
+            ,exp))
         (wait-for exp))))