diff --git a/tools/test.py b/tools/test.py
index b0cd9abcd2..eed3c65a98 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1437,4 +1437,10 @@ def Main():
 
 
 if __name__ == '__main__':
-  sys.exit(Main())
+  ret = 0
+  try:
+    ret = Main()
+    sys.exit(ret)
+  finally:
+    if ret and not utils.IsWindows():
+      os.killpg(0, signal.SIGKILL)