diff --git a/contrib/test/integration/build/kubernetes.yml b/contrib/test/integration/build/kubernetes.yml
index 12340f6525e..9281a4be780 100644
--- a/contrib/test/integration/build/kubernetes.yml
+++ b/contrib/test/integration/build/kubernetes.yml
@@ -8,15 +8,6 @@
     version: "{{ k8s_git_version }}"
     force: "{{ force_clone | default(False) | bool}}"
 
-# replace hardcoded line not to use legacy stats provider
-- name: use CRI stats
-  lineinfile:
-    path: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/pkg/kubelet/cadvisor/util.go"
-    regexp: '^(\s*)runtimeEndpoint == CrioSocket \|\| runtimeEndpoint == \"unix\:\/\/\"\+CrioSocket$'
-    # keep the whitespace to ensure the file still looks pretty :)
-    line: '\1false'
-    backrefs: yes
-
 - name: install etcd
   command: "hack/install-etcd.sh"
   args:
@@ -53,7 +44,7 @@
 
       # Whole script added by Ansible from build/kubernetes.yml
       export PATH=/usr/local/go/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/root/bin:{{ ansible_env.GOPATH }}/bin:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/third_party/etcd:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/_output/local/bin/linux/amd64/
-      export FEATURE_GATES="AllAlpha=false,RunAsGroup=true"
+      export FEATURE_GATES="AllAlpha=false"
       export CONTAINER_RUNTIME=remote
       export CGROUP_DRIVER=systemd
       export CONTAINER_RUNTIME_ENDPOINT='{{ crio_socket }}'
diff --git a/contrib/test/integration/e2e.yml b/contrib/test/integration/e2e.yml
index 7cd53022adc..53c40540b51 100644
--- a/contrib/test/integration/e2e.yml
+++ b/contrib/test/integration/e2e.yml
@@ -25,8 +25,8 @@
       - "CSI Volumes [Driver: csi-hostpath] [Testpattern: Dynamic PV (block volmode)] volumes should store data"
       # Started failing at https://github.com/kubernetes/kubernetes/pull/98587, and tests something out of the scope of CRI-O
       - "ServiceAccountIssuerDiscovery should support OIDC discovery of service account issuer"
-      # TODO: remove once https://github.com/kubernetes/kubernetes/issues/96565 is fixed
-      - "Pods Extended [k8s.io] Pod Container Status should never report success for a pending container"
+      # Tests run on a single node
+      - "Conformance Tests should have at least two untainted nodes"
   set_fact:
     e2e_shell_cmd: >
         DBUS_SESSION_BUS_ADDRESS="unix:path=/var/run/dbus/system_bus_socket" KUBE_CONTAINER_RUNTIME="remote" GINKGO_TOLERATE_FLAKES="y" GINKGO_PARALLEL_NODES=6 GINKGO_PARALLEL=y KUBE_SSH_USER="{{ ssh_user }}" LOCAL_SSH_KEY="{{ ssh_location }}"
diff --git a/contrib/test/integration/main.yml b/contrib/test/integration/main.yml
index 7667efa7358..b14ced42d1a 100644
--- a/contrib/test/integration/main.yml
+++ b/contrib/test/integration/main.yml
@@ -25,17 +25,17 @@
     - name: clone build and install kubernetes
       include: "build/kubernetes.yml"
       vars:
-        k8s_git_version: "release-1.21"
+        k8s_git_version: "master"
         k8s_github_fork: "kubernetes"
-        crio_socket: "/var/run/crio/crio.sock"
+        crio_socket: "/run/crio/crio.sock"
       when: "(cgroupv2 is undefined) or (cgroupv2 == False) | bool"
 
     - name: clone build and install kubernetes for cgroup v2
       include: "build/kubernetes.yml"
       vars:
-        k8s_git_version: "release-1.21"
+        k8s_git_version: "master"
         k8s_github_fork: "kubernetes"
-        crio_socket: "/var/run/crio/crio.sock"
+        crio_socket: "/run/crio/crio.sock"
       when: "cgroupv2 | bool"
 
     - name: clone build and install kubetest
@@ -151,9 +151,9 @@
       include: "build/kubernetes.yml"
       vars:
         force_clone: true
-        k8s_git_version: "release-1.21"
+        k8s_git_version: "master"
         k8s_github_fork: "kubernetes"
-        crio_socket: "/var/run/crio/crio.sock"
+        crio_socket: "/run/crio/crio.sock"
 
     - name: clone build and install kubetest
       include: "build/kubetest.yml"
@@ -174,17 +174,17 @@
       include: "build/kubernetes.yml"
       vars:
         force_clone: true
-        k8s_git_version: "release-1.21"
+        k8s_git_version: "master"
         k8s_github_fork: "kubernetes"
-        crio_socket: "/var/run/crio/crio.sock"
+        crio_socket: "/run/crio/crio.sock"
       when: "(cgroupv2 is undefined) or (cgroupv2 == False) | bool"
     - name: clone build and install kubernetes for cgroup v2
       include: "build/kubernetes.yml"
       vars:
         force_clone: true
-        k8s_git_version: "release-1.21"
+        k8s_git_version: "master"
         k8s_github_fork: "kubernetes"
-        crio_socket: "/var/run/crio/crio.sock"
+        crio_socket: "/run/crio/crio.sock"
       when: "cgroupv2 | bool"
 
     - name: clone build and install kubetest