diff --git a/tools/test.py b/tools/test.py
index 59801e1b07498b..d1684e86d14ffe 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -174,7 +174,7 @@ def Run(self, tasks) -> Dict:
       raise
     self.Done()
     return {
-      'allPassed': not self.failed,
+      'allPassed': not self.failed and not self.shutdown_event.is_set(),
       'failed': self.failed,
     }
 
@@ -1843,11 +1843,12 @@ def should_keep(case):
 
   if result['allPassed']:
     print("\nAll tests passed.")
-  else:
+  elif result['failed']:
     print("\nFailed tests:")
     for failure in result['failed']:
       print(EscapeCommand(failure.command))
-
+  else:
+    print("\nTest aborted.")
   return exitcode