diff --git a/wptrunner/wptrunner.py b/wptrunner/wptrunner.py
index d3ad2f42f025cf..47560c83a351b6 100644
--- a/wptrunner/wptrunner.py
+++ b/wptrunner/wptrunner.py
@@ -102,6 +102,8 @@ def list_disabled(test_paths, product, **kwargs):
 def get_pause_after_test(test_loader, **kwargs):
     total_tests = sum(len(item) for item in test_loader.tests.itervalues())
     if kwargs["pause_after_test"] is None:
+        if kwargs["repeat_until_unexpected"]:
+            return False
         if kwargs["repeat"] == 1 and total_tests == 1:
             return True
         return False