diff --git a/Makefile b/Makefile
index 56b688f..55c020c 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ run: boot.img
 
 .PHONY: test
 test:
-	cd tests && make clean && ../dependencies/bin/shunit.sh -f $(TEST_FORMAT) -t test.sh
+	cd tests && make clean && ../dependencies/bin/shunit.sh -f $(TEST_FORMAT) -t test.sh ; exit $$?
 
 .PHONY: clean
 clean:
diff --git a/dependencies/bin/shunit.sh b/dependencies/bin/shunit.sh
index a2cac8a..c9b8ee1 100755
--- a/dependencies/bin/shunit.sh
+++ b/dependencies/bin/shunit.sh
@@ -54,3 +54,5 @@ do
 done
 
 ${FORMATTER}_footer
+
+exit $(expr ${SHUNIT_FAILURES} + ${SHUNIT_ERRORS})