diff --git a/test/containerd/env b/test/containerd/env
deleted file mode 100644
index f8b95e79b..000000000
--- a/test/containerd/env
+++ /dev/null
@@ -1,4 +0,0 @@
-CONTAINERD_TEST: 'true'
-CONTAINERD_LOG_LEVEL: 'debug'
-CONTAINERD_DEPLOY_PATH: 'cri-containerd-staging/containerd'
-CONTAINERD_PKG_PREFIX: 'containerd-cni'
diff --git a/test/containerd/image-config.yaml b/test/containerd/image-config.yaml
deleted file mode 100644
index 4b2787454..000000000
--- a/test/containerd/image-config.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-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<cluster/gce/configure.sh,containerd-env<test/containerd/env"
-  cos-stable:
-    image_regex: cos-stable-60-9592-84-0
-    project: cos-cloud
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/containerd/env,gci-update-strategy=update_disabled"
diff --git a/test/e2e_node/benchmark-config.yaml b/test/e2e_node/benchmark-config.yaml
deleted file mode 100644
index 674c98ee6..000000000
--- a/test/e2e_node/benchmark-config.yaml
+++ /dev/null
@@ -1,204 +0,0 @@
----
-images:
-  cosstable2-resource1:
-    image: cos-stable-60-9592-90-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 0 pods per node \[Benchmark\]'
-  cosstable2-resource2:
-    image: cos-stable-60-9592-90-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 35 pods per node \[Benchmark\]'
-  cosstable2-resource3:
-    image: cos-stable-60-9592-90-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 105 pods per node \[Benchmark\]'
-
-  cosstable2-density1:
-    image: cos-stable-60-9592-90-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'create 35 pods with 0s? interval \[Benchmark\]'
-  cosstable2-density2:
-    image: cos-stable-60-9592-90-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'create 105 pods with 0s? interval \[Benchmark\]'
-  cosstable2-density2-qps60:
-    image: cos-stable-60-9592-90-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
-  cosstable2-density3:
-    image: cos-stable-60-9592-90-0
-    project: cos-cloud
-    machine: n1-standard-2
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'create 105 pods with 0s? interval \[Benchmark\]'
-  cosstable2-density4:
-    image: cos-stable-60-9592-90-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'create 105 pods with 100ms interval \[Benchmark\]'
-
-  cosstable1-resource1:
-    image: cos-stable-63-10032-71-0 
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 0 pods per node \[Benchmark\]'
-  cosstable1-resource2:
-    image: cos-stable-63-10032-71-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 35 pods per node \[Benchmark\]'
-  cosstable1-resource3:
-    image: cos-stable-63-10032-71-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 105 pods per node \[Benchmark\]'
-  cosbeta-resource1:
-    image: cos-beta-63-10032-71-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 0 pods per node \[Benchmark\]'
-  cosbeta-resource2:
-    image: cos-beta-63-10032-71-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 35 pods per node \[Benchmark\]'
-  cosbeta-resource3:
-    image: cos-beta-63-10032-71-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 105 pods per node \[Benchmark\]'
-
-  cosbeta-density1:
-    image: cos-beta-63-10032-71-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'create 35 pods with 0s? interval \[Benchmark\]'
-  cosbeta-density2:
-    image: cos-beta-63-10032-71-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'create 105 pods with 0s? interval \[Benchmark\]'
-  cosbeta-density2-qps60:
-    image: cos-beta-63-10032-71-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
-  cosbeta-density3:
-    image: cos-beta-63-10032-71-0
-    project: cos-cloud
-    machine: n1-standard-2
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'create 105 pods with 0s? interval \[Benchmark\]'
-  cosbeta-density4:
-    image: cos-beta-63-10032-71-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'create 105 pods with 100ms interval \[Benchmark\]'
-
-  cosdev-resource1:
-    image: cos-dev-64-10112-0-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 0 pods per node \[Benchmark\]'
-  cosdev-resource2:
-    image: cos-dev-64-10112-0-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 35 pods per node \[Benchmark\]'
-  cosdev-resource3:
-    image: cos-dev-64-10112-0-0
-    project: cos-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
-    tests:
-      - 'resource tracking for 105 pods per node \[Benchmark\]'
-
-  ubuntustable2-resource1:
-    image: ubuntu-gke-1604-xenial-v20170816-1
-    project: ubuntu-os-gke-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-env<test/env"
-    tests:
-      - 'resource tracking for 0 pods per node \[Benchmark\]'
-  ubuntustable2-resource2:
-    image: ubuntu-gke-1604-xenial-v20170816-1
-    project: ubuntu-os-gke-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-env<test/env"
-    tests:
-      - 'resource tracking for 35 pods per node \[Benchmark\]'
-  ubuntustable2-resource3:
-    image: ubuntu-gke-1604-xenial-v20170816-1
-    project: ubuntu-os-gke-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-env<test/env"
-    tests:
-      - 'resource tracking for 105 pods per node \[Benchmark\]'
-
-  ubuntustable1-resource1:
-    image: ubuntu-gke-1604-xenial-v20171108-1
-    project: ubuntu-os-gke-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-env<test/env"
-    tests:
-      - 'resource tracking for 0 pods per node \[Benchmark\]'
-  ubuntustable1-resource2:
-    image: ubuntu-gke-1604-xenial-v20171108-1
-    project: ubuntu-os-gke-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-env<test/env"
-    tests:
-      - 'resource tracking for 35 pods per node \[Benchmark\]'
-  ubuntustable1-resource3:
-    image: ubuntu-gke-1604-xenial-v20171108-1
-    project: ubuntu-os-gke-cloud
-    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-env<test/env"
-    tests:
-      - 'resource tracking for 105 pods per node \[Benchmark\]'
diff --git a/test/e2e_node/image-config.yaml b/test/e2e_node/image-config.yaml
deleted file mode 100644
index c559445a4..000000000
--- a/test/e2e_node/image-config.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-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<cluster/gce/configure.sh,containerd-env<test/env"
-  cos-stable:
-    image_regex: cos-stable-60-9592-84-0
-    project: cos-cloud
-    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/env,gci-update-strategy=update_disabled"
diff --git a/test/env b/test/env
deleted file mode 100644
index a642f0e99..000000000
--- a/test/env
+++ /dev/null
@@ -1,2 +0,0 @@
-CONTAINERD_TEST: 'true'
-CONTAINERD_LOG_LEVEL: 'debug'