diff --git a/.travis.yml b/.travis.yml
index 058af4a38..c79ea98f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: cpp
 sudo: false
 
 git:
-  depth: 1
+  depth: 2
 
 addons:
   postgresql: "9.4"
diff --git a/Makefile b/Makefile
index d9749b86e..3e2bff9eb 100755
--- a/Makefile
+++ b/Makefile
@@ -59,10 +59,7 @@ uninstall:
 	@$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 uninstall
 
 test:
-	@source localize.sh && source mapnik-settings.env && ./test/unit/run && \
-	for FILE in test/standalone/*-bin; do \
-		$${FILE}; \
-	done; 
+	./run_tests
 
 check: test
 
diff --git a/run_tests b/run_tests
new file mode 100755
index 000000000..927b233ac
--- /dev/null
+++ b/run_tests
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+failures=0
+
+source ./localize.sh
+source mapnik-settings.env
+
+./test/unit/run 
+failures=$((failures+$?))
+
+if [ -n "$(find test/standalone/ -maxdepth 1 -name '*-bin' -print -quit)" ]; then
+    for FILE in test/standalone/*-bin; do 
+        ${FILE};
+      failures=$((failures+$?))
+    done
+fi
+
+exit $failures
\ No newline at end of file