diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh
index cb7c1bbd4..b439f10ca 100755
--- a/tests/integration/cri-containerd/integration-tests.sh
+++ b/tests/integration/cri-containerd/integration-tests.sh
@@ -103,24 +103,34 @@ function create_containerd_config() {
 	fi
 
 	# check containerd config version
+	#
+	# we're only testing with config version 2 and 3,
+	# as that's what all sypported versions of containerd
+	# have at this moment in time.
+	local pluginid=\"io.containerd.grpc.v1.cri\"
+	local version="2"
+
 	if containerd config default | grep -q "version = 3\>"; then
 		pluginid=\"io.containerd.cri.v1.runtime\"
-	else
-		pluginid="cri"
+		version="3"
 	fi
+
 	info "Kata Config Path ${runtime_config_path}, Runtime Binary Name ${runtime_binary_path}"
 
 cat << EOF | sudo tee "${CONTAINERD_CONFIG_FILE}"
+$( [ -n "${version}" ] && \
+echo "version = ${version}" 
+)
 [debug]
   level = "debug"
 [plugins]
   [plugins.${pluginid}]
     [plugins.${pluginid}.containerd]
-        default_runtime_name = "$runtime"
+        default_runtime_name = "${runtime}"
       [plugins.${pluginid}.containerd.runtimes.${runtime}]
         runtime_type = "${runtime_type}"
         sandboxer = "${SANDBOXER}"
-        $( [ $kata_annotations -eq 1 ] && \
+        $( [ ${kata_annotations} -eq 1 ] && \
         echo 'pod_annotations = ["io.katacontainers.*"]' && \
         echo '        container_annotations = ["io.katacontainers.*"]'
         )
@@ -128,7 +138,7 @@ cat << EOF | sudo tee "${CONTAINERD_CONFIG_FILE}"
           ConfigPath = "${runtime_config_path}"
           BinaryName = "${runtime_binary_path}"
 $( [ -n "$containerd_shim_path" ] && \
-echo "[plugins.linux]" && \
+echo "[plugins.${pluginid}.linux]" && \
 echo "  shim = \"${containerd_shim_path}\""
 )
 EOF