diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3e302ecac..605990e5b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,7 +22,6 @@ jobs:
       - persist_to_workspace:
           root: .
           paths: "*"
-      - setup_remote_docker
   linter:
     <<: *defaults
     steps:
@@ -49,6 +48,7 @@ jobs:
     <<: *defaults
     steps:
       - *fast-checkout
+      - setup_remote_docker
       - run: make clustertests-build
   prerelease:
     <<: *base-test
@@ -105,6 +105,9 @@ workflows:
       - test-golang-1.10-386:
           requires:
             - build
+      - cluster-tests:
+          requires:
+            - build
       - prerelease:
           requires:
             - linter