diff --git a/test.sh b/test.sh
index fb1904f7..6b423ef5 100755
--- a/test.sh
+++ b/test.sh
@@ -4,31 +4,43 @@ echo running test.sh
 echo "ENV:"
 env
 
+run-test()
+{
+	$@ || FAILURES=$( [ "$FAILURES" ] && echo "$FAILURES\\n$@" || echo "$@" )
+}
+
 # ensure there is no trailing whitespace or other whitespace errors
-git diff-tree --check $(git hash-object -t tree /dev/null) HEAD
+run-test git diff-tree --check $(git hash-object -t tree /dev/null) HEAD
 
 # ensure entries to authors file are sorted
 start=$(($(grep -n '^[[:space:]]*$' AUTHORS | awk -F ':' '{print $1}' | head -1) + 1))
-diff <(tail -n +$start AUTHORS | sort) <(tail -n +$start AUTHORS)
+run-test diff <(tail -n +$start AUTHORS | sort) <(tail -n +$start AUTHORS)
 
-./test/test-gofmt.sh
-./test/test-yamlfmt.sh
-./test/test-bashfmt.sh
-./test/test-headerfmt.sh
-go test
-./test/test-govet.sh
+run-test ./test/test-gofmt.sh
+run-test ./test/test-yamlfmt.sh
+run-test ./test/test-bashfmt.sh
+run-test ./test/test-headerfmt.sh
+run-test go test
+run-test ./test/test-govet.sh
 
 # do these longer tests only when running on ci
 if env | grep -q -e '^TRAVIS=true$' -e '^JENKINS_URL=' -e '^BUILD_TAG=jenkins'; then
-	go test -race
-	./test/test-shell.sh
+	run-test go test -race
+	run-test ./test/test-shell.sh
 else
 	# FIXME: this fails on travis for some reason
-	./test/test-reproducible.sh
+	run-test ./test/test-reproducible.sh
 fi
 
 # run omv tests on jenkins physical hosts only
 if env | grep -q -e '^JENKINS_URL=' -e '^BUILD_TAG=jenkins'; then
-	./test/test-omv.sh
+	run-test ./test/test-omv.sh
+fi
+run-test ./test/test-golint.sh	# test last, because this test is somewhat arbitrary
+
+if [ "$FAILURES" ] ; then
+	echo
+	echo "FAILED TESTS:"
+	echo -e $FAILURES
+	exit 1
 fi
-./test/test-golint.sh	# test last, because this test is somewhat arbitrary