diff --git a/tools/test.py b/tools/test.py
index 112d5edaffaf4f..5433411e07e7bb 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -142,7 +142,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: