diff --git a/Makefile b/Makefile
index fe7a5af00..9f487d3b8 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,9 @@ e2e-build:
 	docker build --tag="postgres-operator-e2e-tests" -f e2e/Dockerfile .
 
 e2e-tools:
-	@go get -u sigs.k8s.io/kind
+	wget https://github.com/kubernetes-sigs/kind/releases/download/0.2.1/kind-linux-amd64
+	chmod +x kind-linux-amd64
+	mv kind-linux-amd64 /tmp/kind
 
 e2e-run: docker
 	e2e/run.sh
diff --git a/delivery.yaml b/delivery.yaml
index 6dd6faec8..a60a656b1 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -43,13 +43,8 @@ pipeline:
             go test ./...
         - desc: 'Run e2e tests'
           cmd: |
-            export PATH=$PATH:$HOME/go/bin
             cd $OPERATOR_TOP_DIR/postgres-operator
-            wget https://github.com/kubernetes-sigs/kind/releases/download/0.2.1/kind-linux-amd64
-            chmod +x kind-linux-amd64
-            mv kind-linux-amd64 /tmp/kind
-            export PATH=$PATH:/tmp
-            make e2e-build e2e-run
+            make e2e-tools e2e-build e2e-run
         - desc: 'Push docker image'
           cmd: |
             export PATH=$PATH:$HOME/go/bin
diff --git a/e2e/run.sh b/e2e/run.sh
index 2c0c3d295..dc6a18b49 100755
--- a/e2e/run.sh
+++ b/e2e/run.sh
@@ -6,6 +6,8 @@ set -o nounset
 set -o pipefail
 IFS=$'\n\t'
 
+export PATH=$PATH:/tmp/kind
+
 readonly cluster_name="postgres-operator-e2e-tests"
 readonly operator_image=$(docker images --filter=reference="registry.opensource.zalan.do/acid/postgres-operator" --format "{{.Repository}}:{{.Tag}}"  | head -1)
 readonly e2e_test_image=${cluster_name}