diff --git a/.travis.yml b/.travis.yml
index 32060472e9f..0bdde06bb35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,5 +29,5 @@ cache:
     - $HOME/.cache/pip
 install: pip install -U tox coveralls
 language: python
-script: tox
+script: travis_wait tox
 after_success: coveralls
diff --git a/tox.ini b/tox.ini
index 4a51828f42d..aede0246209 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,11 +9,8 @@ setenv =
 ; which get read in from setup.py. If we don't force our locale to a
 ; utf8 one, tox's env is reset. And the install of these 2 packages
 ; fail.
-whitelist_externals = 
-    /usr/bin/env
-    /usr/bin/travis_wait
-; TEMP, to get cache going on Travis :-/
-install_command = /usr/bin/env LANG=C.UTF-8 /usr/bin/travis_wait pip install {opts} {packages}
+whitelist_externals = /usr/bin/env
+install_command = /usr/bin/env LANG=C.UTF-8 pip install {opts} {packages}
 commands =
      py.test --timeout=30 --duration=10 --cov --cov-report= {posargs}
 deps =