diff --git a/.travis.yml b/.travis.yml
index bf52f6d..931850e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,5 @@ env:
   - DOKKU_VERSION=master DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis
   - DOKKU_VERSION=v0.14.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis
   - DOKKU_VERSION=v0.12.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis
+install: make setup
 script: make test
diff --git a/Makefile b/Makefile
index 0288fb8..f7af040 100644
--- a/Makefile
+++ b/Makefile
@@ -46,4 +46,4 @@ setup:
 	bash tests/setup.sh
 	$(MAKE) ci-dependencies
 
-test: setup lint unit-tests
+test: lint unit-tests