diff --git a/.travis.yml b/.travis.yml
index 2f9a915d6..e684e197f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,13 @@ branches:
   only:
     - master
 
+before_install:  
+    - sudo apt-get update
+    - sudo apt-get install -y docker-engine
+    - sudo apt-get install -y qemu
+
 install:
-  - make travis
   - make bootstrap
 
 script:
-  - travis_wait make test
+  - make travis
diff --git a/GNUmakefile b/GNUmakefile
index 1b8467548..27471ea68 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -80,7 +80,6 @@ install: bin/nomad
 	install -o root -g wheel -m 0755 ./bin/nomad /usr/local/bin/nomad
 
 travis:
-	@sudo apt-get install -y qemu
-	@sh -c "'$(PWD)/scripts/update_docker.sh'"
+	@sh -c "'$(PWD)/scripts/travis.sh'"
 
 .PHONY: all bin cov integ test vet web web-push test-nodep
diff --git a/scripts/travis.sh b/scripts/travis.sh
new file mode 100755
index 000000000..1edd5f6d4
--- /dev/null
+++ b/scripts/travis.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+export PING_SLEEP=30
+bash -c "while true; do echo \$(date) - building ...; sleep $PING_SLEEP; done" &
+PING_LOOP_PID=$!
+
+make test
+TEST_OUTPUT=$?
+
+kill $PING_LOOP_PID
+exit $TEST_OUTPUT