diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c17f0e..e165f5e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,6 +38,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: wget -O - --retry-connrefused http://localhost:80/
@@ -53,6 +54,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: make -e storage-test
@@ -67,6 +69,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: make -e storage-test
@@ -80,6 +83,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-style
       - *save_caches
 
       - run: make -e style
@@ -94,6 +98,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: make -e test
@@ -108,6 +113,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: make -e test
@@ -122,6 +128,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: make -e test
@@ -136,6 +143,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: make -e test
@@ -150,6 +158,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: make -e test
@@ -165,6 +174,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: make -e test
@@ -179,6 +189,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: make -e test
@@ -193,6 +204,7 @@ jobs:
       - checkout
       - *restore_caches
       - *basic_setup
+      - run: make -e install-dev install-test
       - *save_caches
 
       - run: make -e rust-test
diff --git a/scripts/circleci-install.sh b/scripts/circleci-install.sh
index 31c947b..4d3d9b1 100644
--- a/scripts/circleci-install.sh
+++ b/scripts/circleci-install.sh
@@ -9,10 +9,3 @@ virtualenv ~/env
 
 echo ". ~/env/bin/activate" >> $BASH_ENV
 . $BASH_ENV
-
-pip install docker-compose
-
-make -e install-dev install-test
-if python --version | grep -q 'Python 3.6'; then
-    make -e install-style
-fi