diff --git a/tools/test.py b/tools/test.py
index 71a754091ad292..811db910608812 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -141,7 +141,7 @@ def Run(self, tasks):
       # Wait for the remaining threads
       for thread in threads:
         # Use a timeout so that signals (ctrl-c) will be processed.
-        thread.join(timeout=10000000)
+        thread.join(timeout=1000000)
     except (KeyboardInterrupt, SystemExit):
       self.shutdown_event.set()
     except Exception: