diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3215854e9..d40e6b37c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -114,7 +114,7 @@ jobs:
       - run: make test TEST_FLAGS="-race -tags integration -timeout 5m"
       - run: make check-generated
       - run: make all
-      - run: make e2e
+      - run: E2E_KIND_CLUSTER_NUM=4 make e2e
       - run: make test-docs
       - save_cache:
           key: cache-{{ checksum "Makefile" }}
diff --git a/test/e2e/run.bash b/test/e2e/run.bash
index 5ef3c5d32..0ba2510d2 100755
--- a/test/e2e/run.bash
+++ b/test/e2e/run.bash
@@ -31,10 +31,6 @@ function install_kind() {
 
 # Create multiple Kind clusters and run jobs in parallel?
 # Let users specify how many, e.g. with E2E_KIND_CLUSTER_NUM=3 make e2e
-if [ -n "$CI" ]; then
-  # Use four Kind clusters when running the tests in CircleCI
-  E2E_KIND_CLUSTER_NUM=4
-fi
 E2E_KIND_CLUSTER_NUM=${E2E_KIND_CLUSTER_NUM:-1}
 
 # Check if there is a kubernetes cluster running, otherwise use Kind