diff --git a/Makefile b/Makefile
index 5e9d0835992f..129723b3d439 100644
--- a/Makefile
+++ b/Makefile
@@ -112,9 +112,11 @@ v8:
 	$(MAKE) -C deps/v8 $(V8_ARCH) $(V8_BUILD_OPTIONS)
 
 test: | cctest  # Depends on 'all'.
-	$(PYTHON) tools/test.py --mode=release message parallel sequential -J
-	$(MAKE) jslint
-	$(MAKE) cpplint
+	RC=0; \
+	$(PYTHON) tools/test.py --mode=release message parallel sequential -J || RC=$$?; \
+	$(MAKE) jslint || RC=$$?; \
+	$(MAKE) cpplint || RC=$$?; \
+	exit $$RC
 
 test-parallel: all
 	$(PYTHON) tools/test.py --mode=release parallel -J