diff --git a/.travis.yml b/.travis.yml
index f81bc77..2b1695c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,6 @@
   },
   "install": [
     ". scripts/travis-install.sh",
-    "pip install -U pip setuptools",
-    "pip install wheel",
-    "make -e install-dev",
     "make -e install-$BUILD"
   ],
   "language": "python",
diff --git a/Makefile b/Makefile
index e862a03..3be76ed 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ install-servers:
 		(cd $(TESTSERVER_BASE)$$server && sh install.sh); \
 	done
 
-install-test: install-servers
+install-test: install-servers install-dev
 	pip install -Ur test-requirements.txt
 	set -xe && if [ "$$REQUIREMENTS" = "devel" ]; then \
 		pip install -U --force-reinstall \
@@ -81,7 +81,7 @@ install-test: install-servers
 	fi
 	[ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES)
 
-install-style: install-docs
+install-style: install-docs install-dev
 	pip install -U flake8 flake8-import-order flake8-bugbear autopep8
 	
 style:
@@ -114,6 +114,7 @@ release-deb:
 	sh scripts/release-deb.sh ubuntu zesty
 
 install-dev:
+	pip install -U pip setuptools wheel
 	pip install -e .
 	[ "$(ETESYNC_TESTS)" = "false" ] || pip install -Ue .[etesync]
 	set -xe && if [ "$(REQUIREMENTS)" = "devel" ]; then \
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 15f872c..43f1180 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -22,9 +22,6 @@ cfg['branches'] = {
 
 cfg['install'] = """
 . scripts/travis-install.sh
-pip install -U pip setuptools
-pip install wheel
-make -e install-dev
 make -e install-$BUILD
 """.strip().splitlines()