diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
new file mode 100755
index 000000000..716594824
--- /dev/null
+++ b/scripts/run_tests.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+cd build/Testing
+
+for TEST in ./test_* ; do
+    ${TEST}
+done
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index 61c2e5205..4f02c5b7e 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -9,11 +9,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     #
     make linux -j4 BUILDTYPE=${BUILDTYPE}
     make test -j4 BUILDTYPE=${BUILDTYPE}
-    cd build/Testing
-    for TEST in ./test_* ; do
-        ${TEST}
-    done
-    cd ../..
+    ./scripts/run_tests.sh
     (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true; ./bin/deploy_results.sh))
 elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
     #