diff --git a/build/lib/release.sh b/build/lib/release.sh
index d8fb1f3df2f..0482b61f4d4 100644
--- a/build/lib/release.sh
+++ b/build/lib/release.sh
@@ -310,7 +310,7 @@ function kube::release::build_conformance_image() {
   local -r save_dir="${4-}"
   kube::log::status "Building conformance image for arch: ${arch}"
   ARCH="${arch}" REGISTRY="${registry}" VERSION="${version}" \
-    make -C cluster/images/conformance/ build >/dev/null
+    make -C test/conformance/image/ build >/dev/null
 
   local conformance_tag
   conformance_tag="${registry}/conformance-${arch}:${version}"
diff --git a/hack/dev-push-conformance.sh b/hack/dev-push-conformance.sh
index 7dee5a6a582..7e0191addca 100755
--- a/hack/dev-push-conformance.sh
+++ b/hack/dev-push-conformance.sh
@@ -42,8 +42,8 @@ IMAGE="${REGISTRY}/conformance-amd64:${VERSION}"
 
 kube::build::verify_prereqs
 kube::build::build_image
-kube::build::run_build_command make WHAT="vendor/github.com/onsi/ginkgo/ginkgo test/e2e/e2e.test cmd/kubectl cluster/images/conformance/go-runner"
+kube::build::run_build_command make WHAT="vendor/github.com/onsi/ginkgo/ginkgo test/e2e/e2e.test cmd/kubectl test/conformance/image/go-runner"
 kube::build::copy_output
 
-make -C "${KUBE_ROOT}/cluster/images/conformance" build
+make -C "${KUBE_ROOT}/test/conformance/image" build
 docker push "${IMAGE}"
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index a50a64af9c7..2ef90306d11 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -110,7 +110,7 @@ kube::golang::conformance_image_targets() {
   local targets=(
     vendor/github.com/onsi/ginkgo/ginkgo
     test/e2e/e2e.test
-    cluster/images/conformance/go-runner
+    test/conformance/image/go-runner
     cmd/kubectl
   )
   echo "${targets[@]}"
@@ -272,7 +272,7 @@ kube::golang::test_targets() {
     cmd/linkcheck
     vendor/github.com/onsi/ginkgo/ginkgo
     test/e2e/e2e.test
-    cluster/images/conformance/go-runner
+    test/conformance/image/go-runner
   )
   echo "${targets[@]}"
 }
diff --git a/test/conformance/image/README.md b/test/conformance/image/README.md
index 9fd26acc96d..14e7b493993 100644
--- a/test/conformance/image/README.md
+++ b/test/conformance/image/README.md
@@ -7,7 +7,7 @@
 
 ```console
 # First, build the binaries by running make from the root directory
-$ make WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo cmd/kubectl cluster/images/conformance/go-runner"
+$ make WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo cmd/kubectl test/conformance/image/go-runner"
 
 # Build for linux/amd64 (default)
 # export REGISTRY=$HOST/$ORG to switch from k8s.gcr.io