diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index cabe5b04..305e48f6 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -66,12 +66,20 @@ jobs:
           fi
 
   test:
-    name: Test against Py ${{ matrix.python }}
+    name: Test against Py ${{ matrix.python }} and K8s ${{ matrix.kubernetes-version }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         python: ["3.12", "3.11", "3.10", "3.9"]
+        kubernetes-version: ["v1.27.11"]
+        include: # on main merges (not PRs), use also different K8s versions for E2E testing
+          - python: "3.12"
+            kubernetes-version: ${{ github.event_name == 'push' && 'v1.28.7' }}
+          - python: "3.12"
+            kubernetes-version: ${{ github.event_name == 'push' && 'v1.29.2' }}
+          - python: "3.12"
+            kubernetes-version: ${{ github.event_name == 'push' && 'v1.30.6' }}
     env:
       FORCE_COLOR: "1"
       IMG_ORG: kubeflow
@@ -124,8 +132,9 @@ jobs:
       - name: Start Kind Cluster
         uses: helm/kind-action@v1.11.0
         with:
-          node_image: "kindest/node:v1.27.11"
+          node_image: kindest/node:${{ matrix.kubernetes-version }}
           cluster_name: chart-testing-py-${{ matrix.python }}
+          kubectl_version: ${{ matrix.kubernetes-version }}
       - name: Load Local Registry Test Image
         env:
           IMG: "${{ env.IMG_ORG }}/${{ env.IMG_REPO }}:${{ steps.tags.outputs.tag }}"