diff --git a/IPython/parallel/tests/test_client.py b/IPython/parallel/tests/test_client.py
index 1cbc1bb..6f108e5 100644
--- a/IPython/parallel/tests/test_client.py
+++ b/IPython/parallel/tests/test_client.py
@@ -285,16 +285,16 @@ class TestClient(ClusterTestCase):
         """wait for an engine to become idle, according to the Hub"""
         rc = self.client
         
-        # timeout 2s, polling every 100ms
-        for i in range(20):
-            qs = rc.queue_status()
+        # timeout 5s, polling every 100ms
+        qs = rc.queue_status()
+        for i in range(50):
             if qs['unassigned'] or any(qs[eid]['tasks'] for eid in rc.ids):
                 time.sleep(0.1)
+                qs = rc.queue_status()
             else:
                 break
         
         # ensure Hub up to date:
-        qs = rc.queue_status()
         self.assertEquals(qs['unassigned'], 0)
         for eid in rc.ids:
             self.assertEquals(qs[eid]['tasks'], 0)