diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 4f803ea..5b75070 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -11,8 +11,7 @@ jobs:
     strategy:
       matrix:
         helm-version:
-          - 2.16.12
-          - 3.3.4
+          - 3.5.0
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -21,19 +20,16 @@ jobs:
         uses: engineerd/setup-kind@v0.5.0
       - name: Build container image
         run: |
-          ./hack/build.sh
+          ./test/build.sh
           kind load docker-image test/podinfo:latest
       - name: Setup Helm
         uses: ./.github/actions/helm
         with:
           helm-version: ${{ matrix.helm-version }}
-      - name: Install Tiller
-        if: ${{ startsWith(matrix.helm-version, '2') }}
-        run: ./hack/tiller.sh
       - name: Deploy
-        run: ./hack/deploy.sh
+        run: ./test/deploy.sh
       - name: Run integration tests
-        run: ./hack/test.sh
+        run: ./test/test.sh
       - name: Debug failure
         if: failure()
         run: |
diff --git a/deploy/kind.sh b/deploy/kind.sh
index 41d250c..f819944 100755
--- a/deploy/kind.sh
+++ b/deploy/kind.sh
@@ -1,5 +1,20 @@
 #! /usr/bin/env sh
 
+mkdir -p bin
+cat > ./bin/kind.yaml <<EOF
+apiVersion: kind.x-k8s.io/v1alpha4
+kind: Cluster
+nodes:
+- role: control-plane
+  extraPortMappings:
+  - containerPort: 80
+    hostPort: 80
+    protocol: TCP
+  - containerPort: 443
+    hostPort: 443
+    protocol: TCP
+EOF
+
 # create the kind cluster
 kind create cluster --config=kind.yaml
 
diff --git a/deploy/kind.yaml b/deploy/kind.yaml
deleted file mode 100644
index fd7063b..0000000
--- a/deploy/kind.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-nodes:
-- role: control-plane
-  extraPortMappings:
-  - containerPort: 80
-    hostPort: 80
-    protocol: TCP
-  - containerPort: 443
-    hostPort: 443
-    protocol: TCP
diff --git a/hack/tiller.sh b/hack/tiller.sh
deleted file mode 100755
index ceaff5c..0000000
--- a/hack/tiller.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /usr/bin/env sh
-
-set -e
-
-kubectl --namespace kube-system create sa tiller
-kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
-helm init --service-account tiller --upgrade --wait
diff --git a/hack/build.sh b/test/build.sh
similarity index 100%
rename from hack/build.sh
rename to test/build.sh
diff --git a/hack/deploy.sh b/test/deploy.sh
similarity index 100%
rename from hack/deploy.sh
rename to test/deploy.sh
diff --git a/hack/e2e.sh b/test/e2e.sh
similarity index 100%
rename from hack/e2e.sh
rename to test/e2e.sh
diff --git a/hack/test.sh b/test/test.sh
similarity index 100%
rename from hack/test.sh
rename to test/test.sh