diff --git a/Makefile b/Makefile
index 26387e68..124af8eb 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,11 @@ test:
 		if grep -q "^--- FAIL" tmp.out; then \
 			rm tmp.out; \
 			exit 1; \
-		elif grep -q "build failed" tmp.out; then \
+		elif grep -q "[build failed]" tmp.out; then \
+			rm tmp.out; \
+			exit 1; \
+		fi; \
+		elif grep -q "[setup failed]" tmp.out; then \
 			rm tmp.out; \
 			exit 1; \
 		fi; \