diff --git a/.github/workflows/acceptance.yaml b/.github/workflows/acceptance.yaml
index 2261ea6..2cb2843 100644
--- a/.github/workflows/acceptance.yaml
+++ b/.github/workflows/acceptance.yaml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kind-k8s-version: [1.16.15, 1.20.15, 1.21.10, 1.22.7, 1.23.4]
+        kind-k8s-version: [1.16.15, 1.20.15, 1.21.12, 1.22.9, 1.23.6, 1.24.1]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -23,11 +23,7 @@ jobs:
         with:
           config: test/kind/config.yaml
           node_image: kindest/node:v${{ matrix.kind-k8s-version }}
-
-      # Skip CSI tests if K8s version < 1.16.x
-      - run: echo K8S_MINOR=$(kubectl version -o json | jq -r .serverVersion.minor) >> $GITHUB_ENV
-      - if: ${{ env.K8S_MINOR < 16 }}
-        run: echo "SKIP_CSI=true" >> $GITHUB_ENV
+          version: v0.14.0
 
       - run: bats ./test/acceptance -t
         env:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f525f2..c17d588 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Unreleased
 
+CHANGES:
+* Start testing against Kubernetes 1.24
+
 ## 0.20.1 (May 25th, 2022)
 CHANGES:
 * `vault-k8s` updated to 0.16.1
diff --git a/Makefile b/Makefile
index 0ac6850..49799e9 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ LOCAL_ACCEPTANCE_TESTS?=false
 KIND_CLUSTER_NAME?=vault-helm
 
 # kind k8s version
-KIND_K8S_VERSION?=v1.20.2
+KIND_K8S_VERSION?=v1.24.1
 
 # Generate json schema for chart values. See test/README.md for more details.
 values-schema:
diff --git a/test/acceptance/csi.bats b/test/acceptance/csi.bats
index c7c6549..ea164f7 100644
--- a/test/acceptance/csi.bats
+++ b/test/acceptance/csi.bats
@@ -2,17 +2,9 @@
 
 load _helpers
 
-check_skip_csi() {
-  if [ ! -z ${SKIP_CSI} ]; then
-    skip "Skipping CSI tests"
-  fi
-}
-
 @test "csi: testing deployment" {
-  check_skip_csi
-
   cd `chart_dir`
-  
+
   kubectl delete namespace acceptance --ignore-not-found=true
   kubectl create namespace acceptance
 
@@ -58,8 +50,6 @@ check_skip_csi() {
 
 # Clean up
 teardown() {
-  check_skip_csi
-
   if [[ ${CLEANUP:-true} == "true" ]]
   then
       echo "helm/pvc teardown"