diff --git a/cluster/images/conformance/Dockerfile b/test/conformance/image/Dockerfile
similarity index 100%
rename from cluster/images/conformance/Dockerfile
rename to test/conformance/image/Dockerfile
diff --git a/cluster/images/conformance/Makefile b/test/conformance/image/Makefile
similarity index 100%
rename from cluster/images/conformance/Makefile
rename to test/conformance/image/Makefile
diff --git a/cluster/images/conformance/OWNERS b/test/conformance/image/OWNERS
similarity index 100%
rename from cluster/images/conformance/OWNERS
rename to test/conformance/image/OWNERS
diff --git a/cluster/images/conformance/README.md b/test/conformance/image/README.md
similarity index 100%
rename from cluster/images/conformance/README.md
rename to test/conformance/image/README.md
diff --git a/cluster/images/conformance/conformance-e2e.sh b/test/conformance/image/conformance-e2e.sh
similarity index 100%
rename from cluster/images/conformance/conformance-e2e.sh
rename to test/conformance/image/conformance-e2e.sh
diff --git a/cluster/images/conformance/conformance-e2e.yaml b/test/conformance/image/conformance-e2e.yaml
similarity index 100%
rename from cluster/images/conformance/conformance-e2e.yaml
rename to test/conformance/image/conformance-e2e.yaml
diff --git a/cluster/images/conformance/go-runner/Makefile b/test/conformance/image/go-runner/Makefile
similarity index 100%
rename from cluster/images/conformance/go-runner/Makefile
rename to test/conformance/image/go-runner/Makefile
diff --git a/cluster/images/conformance/go-runner/README.md b/test/conformance/image/go-runner/README.md
similarity index 100%
rename from cluster/images/conformance/go-runner/README.md
rename to test/conformance/image/go-runner/README.md
diff --git a/cluster/images/conformance/go-runner/cmd.go b/test/conformance/image/go-runner/cmd.go
similarity index 100%
rename from cluster/images/conformance/go-runner/cmd.go
rename to test/conformance/image/go-runner/cmd.go
diff --git a/cluster/images/conformance/go-runner/cmd_test.go b/test/conformance/image/go-runner/cmd_test.go
similarity index 100%
rename from cluster/images/conformance/go-runner/cmd_test.go
rename to test/conformance/image/go-runner/cmd_test.go
diff --git a/cluster/images/conformance/go-runner/const.go b/test/conformance/image/go-runner/const.go
similarity index 100%
rename from cluster/images/conformance/go-runner/const.go
rename to test/conformance/image/go-runner/const.go
diff --git a/cluster/images/conformance/go-runner/env.go b/test/conformance/image/go-runner/env.go
similarity index 100%
rename from cluster/images/conformance/go-runner/env.go
rename to test/conformance/image/go-runner/env.go
diff --git a/cluster/images/conformance/go-runner/env_test.go b/test/conformance/image/go-runner/env_test.go
similarity index 100%
rename from cluster/images/conformance/go-runner/env_test.go
rename to test/conformance/image/go-runner/env_test.go
diff --git a/cluster/images/conformance/go-runner/main.go b/test/conformance/image/go-runner/main.go
similarity index 100%
rename from cluster/images/conformance/go-runner/main.go
rename to test/conformance/image/go-runner/main.go
diff --git a/cluster/images/conformance/go-runner/tar.go b/test/conformance/image/go-runner/tar.go
similarity index 100%
rename from cluster/images/conformance/go-runner/tar.go
rename to test/conformance/image/go-runner/tar.go
diff --git a/cluster/images/conformance/go-runner/tar_test.go b/test/conformance/image/go-runner/tar_test.go
similarity index 100%
rename from cluster/images/conformance/go-runner/tar_test.go
rename to test/conformance/image/go-runner/tar_test.go
diff --git a/cluster/images/conformance/run_e2e.sh b/test/conformance/image/run_e2e.sh
similarity index 100%
rename from cluster/images/conformance/run_e2e.sh
rename to test/conformance/image/run_e2e.sh