diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml
index 0ff461730b..fdd0a09401 100644
--- a/.github/workflows/basic-ci-amd64.yaml
+++ b/.github/workflows/basic-ci-amd64.yaml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         containerd_version: ['lts', 'active']
-        vmm: ['clh', 'dragonball', 'qemu', 'stratovirt', 'cloud-hypervisor']
+        vmm: ['clh', 'dragonball', 'qemu', 'stratovirt', 'cloud-hypervisor', 'qemu-runtime-rs']
     runs-on: garm-ubuntu-2204-smaller
     env:
       CONTAINERD_VERSION: ${{ matrix.containerd_version }}
diff --git a/.github/workflows/run-cri-containerd-tests-s390x.yaml b/.github/workflows/run-cri-containerd-tests-s390x.yaml
index deb546f5f1..cdd8832712 100644
--- a/.github/workflows/run-cri-containerd-tests-s390x.yaml
+++ b/.github/workflows/run-cri-containerd-tests-s390x.yaml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         containerd_version: ['active']
-        vmm: ['qemu']
+        vmm: ['qemu', 'qemu-runtime-rs']
     runs-on: s390x
     env:
       CONTAINERD_VERSION: ${{ matrix.containerd_version }}
diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile
index 9bfd6169e9..c380ca7b7d 100644
--- a/src/runtime-rs/Makefile
+++ b/src/runtime-rs/Makefile
@@ -249,7 +249,7 @@ endif
 ifneq (,$(QEMUCMD))
     KNOWN_HYPERVISORS += $(HYPERVISOR_QEMU)
 
-    CONFIG_FILE_QEMU = configuration-qemu.toml
+    CONFIG_FILE_QEMU = configuration-qemu-runtime-rs.toml
     CONFIG_QEMU = config/$(CONFIG_FILE_QEMU)
     CONFIG_QEMU_IN = $(CONFIG_QEMU).in
 
diff --git a/src/runtime-rs/config/configuration-qemu.toml.in b/src/runtime-rs/config/configuration-qemu-runtime-rs.toml.in
similarity index 100%
rename from src/runtime-rs/config/configuration-qemu.toml.in
rename to src/runtime-rs/config/configuration-qemu-runtime-rs.toml.in
diff --git a/tests/common.bash b/tests/common.bash
index cd969afc2c..d0e2dde1a0 100644
--- a/tests/common.bash
+++ b/tests/common.bash
@@ -450,7 +450,7 @@ function enabling_hypervisor() {
 	declare -r CONTAINERD_SHIM_KATA="/usr/local/bin/containerd-shim-kata-${KATA_HYPERVISOR}-v2"
 
 	case "${KATA_HYPERVISOR}" in
-		dragonball | cloud-hypervisor)
+		dragonball|cloud-hypervisor|qemu-runtime-rs)
 			sudo ln -sf "${KATA_DIR}/runtime-rs/bin/containerd-shim-kata-v2" "${CONTAINERD_SHIM_KATA}"
 			declare -r CONFIG_DIR="${KATA_DIR}/share/defaults/kata-containers/runtime-rs"
 			;;
diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh
index ba30ee7ea9..4a39c3b25e 100755
--- a/tests/integration/cri-containerd/integration-tests.sh
+++ b/tests/integration/cri-containerd/integration-tests.sh
@@ -255,7 +255,12 @@ function TestContainerMemoryUpdate() {
 		DoContainerMemoryUpdate 0
 	fi
 
-	if [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]] || [[ "${ARCH}" == "s390x" ]]; then
+	if [[ "${KATA_HYPERVISOR}" == "qemu-runtime-rs" ]]; then
+		# Remove TestContainerMemoryUpdate from passing_test
+		info "TestContainerMemoryUpdate skipped for qemu with runtime-rs"
+		info "Please check out https://github.com/kata-containers/kata-containers/issues/9375"
+		return
+	elif [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]] || [[ "${ARCH}" == "s390x" ]]; then
 		return
 	fi
 
@@ -657,8 +662,14 @@ function main() {
 	TestContainerMemoryUpdate
 
 	if [[ "${ARCH}" != "ppc64le" ]]; then
-		TestKilledVmmCleanup
-		TestDeviceCgroup
+		if [[ "${KATA_HYPERVISOR}" == "qemu-runtime-rs" ]]; then
+			info "TestKilledVmmCleanup and TestDeviceCgroup skipped for qemu with runtime-rs"
+			info "Please check out https://github.com/kata-containers/kata-containers/issues/9375"
+			break
+		else
+			TestKilledVmmCleanup
+			TestDeviceCgroup
+		fi
 	fi
 
 	popd