diff --git a/tools/osbuilder/tests/test_config.sh b/tools/osbuilder/tests/test_config.sh
index 74020c4e2e..e302f6f7cc 100644
--- a/tools/osbuilder/tests/test_config.sh
+++ b/tools/osbuilder/tests/test_config.sh
@@ -43,23 +43,21 @@ if [ -n "${CI:-}" ]; then
 		skipWhenTestingAll+=("${distro}")
 	done
 
-	if [ "${RUST_AGENT:-}" == "yes" ]; then
-		# add skipForRustDistros to skipWhenTestingAll if it is not
-		for td in "${skipForRustDistros[@]}"; do
-			if distro_in_set "${td}" "${skipWhenTestingAll[@]}"; then
+	# add skipForRustDistros to skipWhenTestingAll if it is not
+	for td in "${skipForRustDistros[@]}"; do
+		if distro_in_set "${td}" "${skipWhenTestingAll[@]}"; then
+			continue
+		fi
+		# not found in skipWhenTestingAll, add to it
+		skipWhenTestingAll+=("${td}")
+	done
+
+	if distro_in_set "${arch}" "${skipForRustArch[@]}"; then
+		for distro in "${test_distros[@]}"; do
+			if distro_in_set "${distro}" "${skipWhenTestingAll[@]}"; then
 				continue
 			fi
-			# not found in skipWhenTestingAll, add to it
-			skipWhenTestingAll+=("${td}")
+			skipWhenTestingAll+=("${distro}")
 		done
-
-		if distro_in_set "${arch}" "${skipForRustArch[@]}"; then
-			for distro in "${test_distros[@]}"; do
-				if distro_in_set "${distro}" "${skipWhenTestingAll[@]}"; then
-					continue
-				fi
-				skipWhenTestingAll+=("${distro}")
-			done
-		fi
 	fi
 fi
diff --git a/tools/osbuilder/tests/test_images.sh b/tools/osbuilder/tests/test_images.sh
index 2e0c2744a6..fbbe5d5901 100755
--- a/tools/osbuilder/tests/test_images.sh
+++ b/tools/osbuilder/tests/test_images.sh
@@ -388,9 +388,7 @@ install_image_create_container()
 
 	showKataRunFailure=1
 	run_mgr reset-config
-	if [ "${RUST_AGENT:-}" = "yes" ]; then
-		run_mgr enable-vsock
-	fi
+	run_mgr enable-vsock
 	run_mgr configure-image "$file"
 	create_container
 	showKataRunFailure=
@@ -408,9 +406,7 @@ install_initrd_create_container()
 
 	showKataRunFailure=1
 	run_mgr reset-config
-	if [ "${RUST_AGENT:-}" = "yes" ]; then
-		run_mgr enable-vsock
-	fi
+	run_mgr enable-vsock
 	run_mgr configure-initrd "$file"
 	create_container
 	showKataRunFailure=