diff --git a/tools/dockerfile/grpc_interop_csharp/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile
similarity index 100%
rename from tools/dockerfile/grpc_interop_csharp/Dockerfile
rename to tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile
diff --git a/tools/dockerfile/grpc_interop_csharp/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_csharp/build_interop.sh
similarity index 100%
rename from tools/dockerfile/grpc_interop_csharp/build_interop.sh
rename to tools/dockerfile/interoptest/grpc_interop_csharp/build_interop.sh
diff --git a/tools/dockerfile/grpc_interop_cxx/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile
similarity index 100%
rename from tools/dockerfile/grpc_interop_cxx/Dockerfile
rename to tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile
diff --git a/tools/dockerfile/grpc_interop_cxx/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh
similarity index 100%
rename from tools/dockerfile/grpc_interop_cxx/build_interop.sh
rename to tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh
diff --git a/tools/dockerfile/grpc_interop_go/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile
similarity index 100%
rename from tools/dockerfile/grpc_interop_go/Dockerfile
rename to tools/dockerfile/interoptest/grpc_interop_go/Dockerfile
diff --git a/tools/dockerfile/grpc_interop_go/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh
similarity index 100%
rename from tools/dockerfile/grpc_interop_go/build_interop.sh
rename to tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh
diff --git a/tools/dockerfile/grpc_interop_http2/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile
similarity index 100%
rename from tools/dockerfile/grpc_interop_http2/Dockerfile
rename to tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile
diff --git a/tools/dockerfile/grpc_interop_http2/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_http2/build_interop.sh
similarity index 100%
rename from tools/dockerfile/grpc_interop_http2/build_interop.sh
rename to tools/dockerfile/interoptest/grpc_interop_http2/build_interop.sh
diff --git a/tools/dockerfile/grpc_interop_java/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile
similarity index 100%
rename from tools/dockerfile/grpc_interop_java/Dockerfile
rename to tools/dockerfile/interoptest/grpc_interop_java/Dockerfile
diff --git a/tools/dockerfile/grpc_interop_java/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_java/build_interop.sh
similarity index 100%
rename from tools/dockerfile/grpc_interop_java/build_interop.sh
rename to tools/dockerfile/interoptest/grpc_interop_java/build_interop.sh
diff --git a/tools/dockerfile/grpc_interop_node/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile
similarity index 100%
rename from tools/dockerfile/grpc_interop_node/Dockerfile
rename to tools/dockerfile/interoptest/grpc_interop_node/Dockerfile
diff --git a/tools/dockerfile/grpc_interop_node/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh
similarity index 100%
rename from tools/dockerfile/grpc_interop_node/build_interop.sh
rename to tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh
diff --git a/tools/dockerfile/grpc_interop_php/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile
similarity index 100%
rename from tools/dockerfile/grpc_interop_php/Dockerfile
rename to tools/dockerfile/interoptest/grpc_interop_php/Dockerfile
diff --git a/tools/dockerfile/grpc_interop_php/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh
similarity index 100%
rename from tools/dockerfile/grpc_interop_php/build_interop.sh
rename to tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh
diff --git a/tools/dockerfile/grpc_interop_python/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile
similarity index 100%
rename from tools/dockerfile/grpc_interop_python/Dockerfile
rename to tools/dockerfile/interoptest/grpc_interop_python/Dockerfile
diff --git a/tools/dockerfile/grpc_interop_python/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_python/build_interop.sh
similarity index 100%
rename from tools/dockerfile/grpc_interop_python/build_interop.sh
rename to tools/dockerfile/interoptest/grpc_interop_python/build_interop.sh
diff --git a/tools/dockerfile/grpc_interop_ruby/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile
similarity index 100%
rename from tools/dockerfile/grpc_interop_ruby/Dockerfile
rename to tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile
diff --git a/tools/dockerfile/grpc_interop_ruby/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh
similarity index 100%
rename from tools/dockerfile/grpc_interop_ruby/build_interop.sh
rename to tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh