diff --git a/test/core/promise/BUILD b/test/core/promise/BUILD
index 532c2f95adc..318756063fc 100644
--- a/test/core/promise/BUILD
+++ b/test/core/promise/BUILD
@@ -540,6 +540,7 @@ grpc_proto_fuzzer(
         "//src/core:poll",
         "//src/core:race",
         "//src/core:seq",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
diff --git a/test/core/xds/xds_client_fuzzer.cc b/test/core/xds/xds_client_fuzzer.cc
index ddeaf96f86d..4649329523e 100644
--- a/test/core/xds/xds_client_fuzzer.cc
+++ b/test/core/xds/xds_client_fuzzer.cc
@@ -336,7 +336,7 @@ class Fuzzer {
 
 bool squelch = true;
 
-DEFINE_PROTO_FUZZER(const xds_client_fuzzer::Message& message) {
+DEFINE_PROTO_FUZZER(const xds_client_fuzzer::Msg& message) {
   grpc_init();
   grpc_core::Fuzzer fuzzer(message.bootstrap());
   for (int i = 0; i < message.actions_size(); i++) {
diff --git a/test/core/xds/xds_client_fuzzer.proto b/test/core/xds/xds_client_fuzzer.proto
index 6d1274eb9cc..e2ce7aa5d46 100644
--- a/test/core/xds/xds_client_fuzzer.proto
+++ b/test/core/xds/xds_client_fuzzer.proto
@@ -16,10 +16,10 @@
 
 syntax = "proto3";
 
-import "src/proto/grpc/testing/xds/v3/discovery.proto";
-
 package xds_client_fuzzer;
 
+import "src/proto/grpc/testing/xds/v3/discovery.proto";
+
 // We'd ideally like to use google.rpc.Status instead of creating our
 // own proto for this, but that winds up causing all sorts of dependency
 // headaches.
@@ -117,7 +117,7 @@ message Action {
   }
 }
 
-message Message {
+message Msg {
   string bootstrap = 1;
   repeated Action actions = 2;
 }