diff --git a/travis/run_tests.sh b/travis/run_tests.sh
index 7b30f3de..cc5225ce 100644
--- a/travis/run_tests.sh
+++ b/travis/run_tests.sh
@@ -1,22 +1,24 @@
 #!/usr/bin/env bash
+
+set -ex
+
 PYTHON_MAJOR_VERSION=$(python -c "import sys; print(sys.version_info[0])");
-mkdir -p $PIP_CACHE
+mkdir -p "$PIP_CACHE"
 mkdir -p wheelhouse
 psql -c 'create database opbeat_test;' -U postgres
 pip install -U pip
-pip install -r test_requirements/requirements-${WEBFRAMEWORK}.txt --cache-dir ${PIP_CACHE}
-pip install -r test_requirements/requirements-python-${PYTHON_MAJOR_VERSION}.txt --cache-dir ${PIP_CACHE}
+pip install -r "test_requirements/requirements-${WEBFRAMEWORK}.txt" --cache-dir "${PIP_CACHE}"
+pip install -r "test_requirements/requirements-python-${PYTHON_MAJOR_VERSION}.txt" --cache-dir "${PIP_CACHE}"
 if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then
-  pip install -r test_requirements/requirements-asyncio.txt --cache-dir ${PIP_CACHE};
+  pip install -r test_requirements/requirements-asyncio.txt --cache-dir "${PIP_CACHE}"
 fi
-if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then
-  pip install -r test_requirements/requirements-cpython.txt --cache-dir ${PIP_CACHE};
+if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then
+  pip install -r test_requirements/requirements-pypy.txt --cache-dir "${PIP_CACHE}"
+else
+  pip install -r test_requirements/requirements-cpython.txt --cache-dir "${PIP_CACHE}"
   if [[ $PYTHON_MAJOR_VERSION == '2' ]]; then
-    pip install -r test_requirements/requirements-zerorpc.txt --cache-dir ${PIP_CACHE};
+    pip install -r test_requirements/requirements-zerorpc.txt --cache-dir "${PIP_CACHE}"
   fi
 fi
-if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then
-  pip install -r test_requirements/requirements-pypy.txt --cache-dir ${PIP_CACHE};
-fi
 
-make test
\ No newline at end of file
+make test