diff --git a/test.py b/test.py
index d46f6c1c4..e0f095b00 100755
--- a/test.py
+++ b/test.py
@@ -1008,6 +1008,9 @@ def run_tests():
 
         proc = subprocess.Popen(waf_cmd, shell = True)
         proc.communicate()
+        if proc.returncode:
+            print >> sys.stderr, "Waf died. Not running tests"
+            return proc.returncode
 
     #
     # Pull some interesting configuration information out of waf, primarily