diff --git a/test/build-containerd.sh b/test/containerd/build.sh
similarity index 95%
rename from test/build-containerd.sh
rename to test/containerd/build.sh
index 43353cade..1464f7b75 100755
--- a/test/build-containerd.sh
+++ b/test/containerd/build.sh
@@ -22,7 +22,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source $(dirname "${BASH_SOURCE[0]}")/build-utils.sh
+source $(dirname "${BASH_SOURCE[0]}")/../build-utils.sh
 cd "${ROOT}"
 
 if [ -z "${GOPATH}" ]; then
diff --git a/test/containerd/deploy-path b/test/containerd/deploy-path
new file mode 100644
index 000000000..f6e1ef39c
--- /dev/null
+++ b/test/containerd/deploy-path
@@ -0,0 +1 @@
+cri-containerd-staging/containerd
diff --git a/test/e2e_node/image-config-containerd.yaml b/test/containerd/image-config.yaml
similarity index 62%
rename from test/e2e_node/image-config-containerd.yaml
rename to test/containerd/image-config.yaml
index a06ce725f..8c7bbee61 100644
--- a/test/e2e_node/image-config-containerd.yaml
+++ b/test/containerd/image-config.yaml
@@ -2,8 +2,8 @@ images:
   ubuntu:
     image: ubuntu-gke-1604-xenial-v20170420-1
     project: ubuntu-os-gke-cloud
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,pkg-prefix=containerd-cni,deploy-path=cri-containerd-staging/containerd"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,pkg-prefix<test/containerd/pkg-prefix,deploy-path<test/containerd/deploy-path"
   cos-stable:
     image_regex: cos-stable-60-9592-84-0
     project: cos-cloud
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled,pkg-prefix=containerd-cni,deploy-path=cri-containerd-staging/containerd"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled,pkg-prefix<test/containerd/pkg-prefix,deploy-path<test/containerd/deploy-path"
diff --git a/test/containerd/pkg-prefix b/test/containerd/pkg-prefix
new file mode 100644
index 000000000..6ee97d0a7
--- /dev/null
+++ b/test/containerd/pkg-prefix
@@ -0,0 +1 @@
+containerd-cni