diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index e6e0d1c8..db1b10fd 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -23,9 +23,9 @@ jobs:
       - name: Setup Kubernetes
         uses: engineerd/setup-kind@v0.5.0
       - name: Build container image
-        run: docker build -t test/flagger:latest .
-      - name: Load test image
-        run: kind load docker-image test/flagger:latest
+        run: |
+          docker build -t test/flagger:latest .
+          kind load docker-image test/flagger:latest
       - name: Run tests
         run: |
           ./test/${{ matrix['provider'] }}/run.sh
diff --git a/test/contour/run.sh b/test/contour/run.sh
index 96efa472..67153fa9 100755
--- a/test/contour/run.sh
+++ b/test/contour/run.sh
@@ -2,10 +2,10 @@
 
 set -o errexit
 
+REPO_ROOT=$(git rev-parse --show-toplevel)
 DIR="$(cd "$(dirname "$0")" && pwd)"
 
 "$DIR"/install.sh
 
-"$DIR"/test-init.sh
+"$REPO_ROOT"/test/workloads/init.sh
 "$DIR"/test-canary.sh
-
diff --git a/test/istio/run.sh b/test/istio/run.sh
index 6b20dae3..b2a3301a 100755
--- a/test/istio/run.sh
+++ b/test/istio/run.sh
@@ -2,15 +2,16 @@
 
 set -o errexit
 
+REPO_ROOT=$(git rev-parse --show-toplevel)
 DIR="$(cd "$(dirname "$0")" && pwd)"
 
 "$DIR"/install.sh
 
-"$DIR"/test-init.sh
+"$REPO_ROOT"/test/workloads/init.sh
 "$DIR"/test-canary.sh
 
-"$DIR"/test-init.sh
+"$REPO_ROOT"/test/workloads/init.sh
 "$DIR"/test-skip-analysis.sh
 
-"$DIR"/test-init.sh
+"$REPO_ROOT"/test/workloads/init.sh
 "$DIR"/test-delegation.sh
diff --git a/test/linkerd/run.sh b/test/linkerd/run.sh
index e3174d56..d09d6557 100755
--- a/test/linkerd/run.sh
+++ b/test/linkerd/run.sh
@@ -2,12 +2,13 @@
 
 set -o errexit
 
+REPO_ROOT=$(git rev-parse --show-toplevel)
 DIR="$(cd "$(dirname "$0")" && pwd)"
 
 "$DIR"/install.sh
 
-"$DIR"/test-init.sh
+"$REPO_ROOT"/test/workloads/init.sh
 "$DIR"/test-canary.sh
 
-"$DIR"/test-init.sh
+"$REPO_ROOT"/test/workloads/init.sh
 "$DIR"/test-steps.sh
diff --git a/test/nginx/run.sh b/test/nginx/run.sh
index 96efa472..67153fa9 100755
--- a/test/nginx/run.sh
+++ b/test/nginx/run.sh
@@ -2,10 +2,10 @@
 
 set -o errexit
 
+REPO_ROOT=$(git rev-parse --show-toplevel)
 DIR="$(cd "$(dirname "$0")" && pwd)"
 
 "$DIR"/install.sh
 
-"$DIR"/test-init.sh
+"$REPO_ROOT"/test/workloads/init.sh
 "$DIR"/test-canary.sh
-
diff --git a/test/nginx/test-canary.sh b/test/nginx/test-canary.sh
index ff185418..980c5f76 100755
--- a/test/nginx/test-canary.sh
+++ b/test/nginx/test-canary.sh
@@ -244,7 +244,7 @@ spec:
         timeout: 5s
         metadata:
           type: bash
-          cmd: "curl -sH 'x-user: insider' -H 'Host: app.example.com' http://ingress-nginx-controller.ingress-nginx | grep '3.1.2'"
+          cmd: "curl -sH 'x-user: insider' -H 'Host: app.example.com' http://ingress-nginx-controller.ingress-nginx | grep '3.1.1'"
       - name: load-test
         type: rollout
         url: http://flagger-loadtester.test/