diff --git a/tests/proxy/basic_proxy.py b/tests/proxy/basic_proxy.py
index 79087be272ba4b2912cc4bc59ff2363af19e9ba8..404fe65aec8dded48f6f6e7a6ff6141ef719e78f 100644
--- a/tests/proxy/basic_proxy.py
+++ b/tests/proxy/basic_proxy.py
@@ -24,7 +24,7 @@ def basic_proxy_one_client(conductor: ClusterConductor, dir, log: Logger):
             node_to_put += 1
             node_to_put = node_to_put % 4
 
-        r = c.get_all(0, timeout=None) # should get all of shard 1's keys
+        r = c.get_all(0, timeout=120) # should get all of shard 1's keys
         assert r.ok, f"expected ok for get, got {r.status_code}"
         items = r.json()["items"]
         keys = items.keys()
@@ -57,7 +57,7 @@ def basic_proxy_many_clients(conductor: ClusterConductor, dir, log: Logger):
             node_to_put += 1
             node_to_put = node_to_put % 7
 
-        r = c.get_all(0, timeout=None)  # should get all of shard 1's keys
+        r = c.get_all(0, timeout=120)  # should get all of shard 1's keys
         assert r.ok, f"expected ok for get, got {r.status_code}"
         items = r.json()["items"]
         keys = items.keys()