diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 0e3157c85..4ae3501a0 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -236,35 +236,30 @@ steps:
     label: ":docker: Containerd 1.4.3 tests"
     command: make containerd-test-1.4.3
     agents:
-      arch: "amd64"
       os: "ubuntu"
   - <<: *common
     label: ":docker: Containerd 1.5.4 tests (cgroupv1)"
     command: make containerd-test-1.5.4
     agents:
       cgroup: "v1"
-      arch: "amd64"
       os: "ubuntu"
   - <<: *common
     label: ":docker: Containerd 1.5.4 tests (cgroupv2)"
     command: make containerd-test-1.5.4
     agents:
       cgroup: "v2"
-      arch: "amd64"
       os: "ubuntu"
   - <<: *common
     label: ":docker: Containerd 1.6.0-rc.4 tests (cgroupv1)"
     command: make containerd-test-1.6.0-rc.4
     agents:
       cgroup: "v1"
-      arch: "amd64"
       os: "ubuntu"
   - <<: *common
     label: ":docker: Containerd 1.6.0-rc.4 tests (cgroupv2)"
     command: make containerd-test-1.6.0-rc.4
     agents:
       cgroup: "v2"
-      arch: "amd64"
       os: "ubuntu"
 
   # Check the website builds.
diff --git a/Makefile b/Makefile
index 4be20438a..3f81445b5 100644
--- a/Makefile
+++ b/Makefile
@@ -312,7 +312,7 @@ fsstress-test: load-basic $(RUNTIME_BIN)
 .PHONY: fsstress-test
 
 # Specific containerd version tests.
-containerd-test-%: load-basic_alpine load-basic_python load-basic_busybox load-basic_resolv load-basic_httpd load-basic_ubuntu $(RUNTIME_BIN)
+containerd-test-%: load-basic_alpine load-basic_python load-basic_busybox load-basic_symlink-resolv load-basic_httpd load-basic_ubuntu $(RUNTIME_BIN)
 	@$(call install_runtime,$(RUNTIME),) # Clear flags.
 	@sudo tools/install_containerd.sh $*
 ifeq (,$(STAGED_BINARIES))
diff --git a/images/basic/resolv/Dockerfile b/images/basic/resolv/Dockerfile
deleted file mode 100644
index 13665bdaf..000000000
--- a/images/basic/resolv/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM k8s.gcr.io/busybox:latest
diff --git a/images/basic/symlink-resolv/Dockerfile b/images/basic/symlink-resolv/Dockerfile
new file mode 100644
index 000000000..7dde5a1d8
--- /dev/null
+++ b/images/basic/symlink-resolv/Dockerfile
@@ -0,0 +1,3 @@
+FROM busybox
+
+ADD resolv.tar /
diff --git a/images/basic/symlink-resolv/resolv.tar b/images/basic/symlink-resolv/resolv.tar
new file mode 100644
index 000000000..4528b3c15
Binary files /dev/null and b/images/basic/symlink-resolv/resolv.tar differ
diff --git a/test/root/crictl_test.go b/test/root/crictl_test.go
index dbe5e9e80..958da3eb7 100644
--- a/test/root/crictl_test.go
+++ b/test/root/crictl_test.go
@@ -181,8 +181,8 @@ func TestMountOverSymlinks(t *testing.T) {
 	}
 	defer cleanup()
 
-	spec := SimpleSpec("busybox", "basic/resolv", []string{"sleep", "1000"}, nil)
-	podID, contID, err := crictl.StartPodAndContainer(containerdRuntime, "basic/resolv", Sandbox("default"), spec)
+	spec := SimpleSpec("busybox", "basic/symlink-resolv", []string{"sleep", "1000"}, nil)
+	podID, contID, err := crictl.StartPodAndContainer(containerdRuntime, "basic/symlink-resolv", Sandbox("default"), spec)
 	if err != nil {
 		t.Fatalf("start failed: %v", err)
 	}