diff --git a/.travis.yml b/.travis.yml
index b641c1158..d2d77a43b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ env:
    - secure: "bG4YYWMfl9API0MSRgmOaJrlGLv06tRg9KJNawBieZvBJbITPpxVGJZT3/l/SEJ+Rl15e2dRex4k+MGQlmT2SqPQxTEYWv1qxNigKPPcla7IWeNmWWqW8uVvFjdglojgBOK2k/xErVQtA4zDfi3mwSXH4DKwquXWsoEKmX2SV7M="
    - secure: "Cbvap9ubVKgjPe3hUhI6JGeDZzBXHpOG9RaYKh+SdoIPhKnlJiNOYm1egomi+e4uqJInlFKuVHTw7Ng9Cun6Zm0jIxpkSchv1GpsR7hmB3UGnGed19Dw8121FwuUaktN+4YnbVlsyd+u8EHD3+h58t4eELrLrZolM4rS7DL6caA="
    - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I="
+   - AWS_S3_BUCKET=mapbox-gl-testing
 
 before_install:
 - source ./scripts/flags.sh
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
     #
diff --git a/setup-libraries.sh b/setup-libraries.sh
index e1ad79daf..1884ebe12 100755
--- a/setup-libraries.sh
+++ b/setup-libraries.sh
@@ -66,7 +66,7 @@ export CXX11=true
 if [ ${UNAME} = 'Darwin' ]; then
 
 if [ ! -z "${TRAVIS:-}" ]; then
-    if aws s3 cp s3://mapbox-gl-testing/dependencies/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz ./out/ ; then
+    if aws s3 cp s3://${AWS_S3_BUCKET}/dependencies/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz ./out/ ; then
         rm -rf out/build-cpp11-libcpp-universal
         tar -xzf out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz
     fi
@@ -119,7 +119,7 @@ export LIBUV_VERSION=0.10.28
 
 if [ ! -z "${TRAVIS:-}" ]; then
     tar -zcf out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz out/build-cpp11-libcpp-universal
-    aws s3 cp out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz s3://mapbox-gl-testing/dependencies/
+    aws s3 cp out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz s3://${AWS_S3_BUCKET}/dependencies/
 fi
 
 fi
@@ -134,7 +134,7 @@ cd ../../
 elif [ ${UNAME} = 'Linux' ]; then
 
 if [ ! -z "${TRAVIS:-}" ]; then
-    if aws s3 cp s3://mapbox-gl-testing/dependencies/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz ./out/ ; then
+    if aws s3 cp s3://${AWS_S3_BUCKET}/dependencies/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz ./out/ ; then
         rm -rf out/build-cpp11-libstdcpp-gcc-x86_64-linux
         tar -xzf out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz
     fi
@@ -152,7 +152,7 @@ export LIBUV_VERSION=0.10.28
 if [ ! -z "${TRAVIS:-}" ]; then
     if ! tar --compare -zf out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz ; then
         tar -zcf out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz out/build-cpp11-libstdcpp-gcc-x86_64-linux
-        aws s3 cp out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz s3://mapbox-gl-testing/dependencies/
+        aws s3 cp out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz s3://${AWS_S3_BUCKET}/dependencies/
     fi
 fi