diff --git a/.github/workflows/psm-interop.yaml b/.github/workflows/psm-interop.yaml
index 9322e970..fbeed3ad 100644
--- a/.github/workflows/psm-interop.yaml
+++ b/.github/workflows/psm-interop.yaml
@@ -50,9 +50,9 @@ jobs:
         run: >
           python -m grpc_tools.protoc --proto_path=.
           --python_out=. --grpc_python_out=.
-          protos/empty.proto
-          protos/messages.proto
-          protos/test.proto
+          protos/grpc/testing/empty.proto
+          protos/grpc/testing/messages.proto
+          protos/grpc/testing/test.proto
 
       - name: "Run unit tests"
         run: python -m tests.unit
diff --git a/protos/empty.proto b/protos/grpc/testing/empty.proto
similarity index 100%
rename from protos/empty.proto
rename to protos/grpc/testing/empty.proto
diff --git a/protos/messages.proto b/protos/grpc/testing/messages.proto
similarity index 100%
rename from protos/messages.proto
rename to protos/grpc/testing/messages.proto
diff --git a/protos/test.proto b/protos/grpc/testing/test.proto
similarity index 98%
rename from protos/test.proto
rename to protos/grpc/testing/test.proto
index 6e1b0311..d8bcd91d 100644
--- a/protos/test.proto
+++ b/protos/grpc/testing/test.proto
@@ -18,8 +18,8 @@
 
 syntax = "proto3";
 
-import "protos/empty.proto";
-import "protos/messages.proto";
+import "protos/grpc/testing/empty.proto";
+import "protos/grpc/testing/messages.proto";
 
 package grpc.testing;