diff --git a/python/ray/test_utils.py b/python/ray/test_utils.py
index 4213e144b..12995b174 100644
--- a/python/ray/test_utils.py
+++ b/python/ray/test_utils.py
@@ -137,9 +137,7 @@ def wait_for_errors(error_type, num_errors, timeout=20):
         num_errors, error_type))
 
 
-def wait_for_condition(condition_predictor,
-                       timeout=1000,
-                       retry_interval_ms=100):
+def wait_for_condition(condition_predictor, timeout=30, retry_interval_ms=100):
     """A helper function that waits until a condition is met.
 
     Args: