diff --git a/.circleci/config.yml b/.circleci/config.yml
index c98be8f10..09c6a5982 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -153,7 +153,7 @@ jobs:
       - run: test/e2e-kind.sh
       - run: test/e2e-skipper.sh
       - run: test/e2e-skipper-tests.sh
-      - run: test/e2e-nginx-cleanup.sh
+      - run: test/e2e-skipper-cleanup.sh
 
   push-helm-charts:
     docker:
diff --git a/test/e2e-skipper.sh b/test/e2e-skipper.sh
index 3bf88c317..756306e99 100755
--- a/test/e2e-skipper.sh
+++ b/test/e2e-skipper.sh
@@ -12,6 +12,16 @@ echo '>>> Installing Skipper Ingress, Flagger and Prometheus'
 # https://github.com/kubernetes-sigs/kustomize/issues/2390
 # Skipper will throw an Prometheus warning which can be ignored:
 # https://github.com/weaveworks/flagger/issues/664
+
+# installing kustomize if not installed
+if ! command -v kustomize &> /dev/null; then
+    echo "kustomize not found, installing"
+    KUSTOMIZE_VERSION=3.8.1
+    curl -L -o /usr/local/bin/kustomize https://github.com/kubernetes-sigs/kustomize/releases/download/v${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64
+    chmod +x /usr/local/bin/kustomize
+    kustomize version
+fi
+
 kustomize build ${REPO_ROOT}/kustomize/skipper | kubectl apply -f -
 
 kubectl rollout status deployment/skipper-ingress -n kube-system
diff --git a/test/local/skipper.sh b/test/local/skipper.sh
deleted file mode 100755
index fce32c57c..000000000
--- a/test/local/skipper.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-REPO_ROOT=$(git rev-parse --show-toplevel)
-cd $REPO_ROOT
-
-# make test
-make build
-docker tag weaveworks/flagger:latest test/flagger:latest
-make loadtester-build
-(kind get clusters && kubectl delete ns/test --force) || kind create cluster --wait 5m --image kindest/node:v1.16.9
-./test/e2e-skipper.sh
-# port forward prometheus UI to localhost:9090
-kubectl port-forward $(kubectl get pods -l=app=flagger-prometheus -o name -n flagger-system | head -n 1) 9090:9090 -n flagger-system &
-
-./test/e2e-skipper-tests.sh