diff --git a/test/core/xds/BUILD b/test/core/xds/BUILD
index 8b661ab3f8f..a69b2ce45a0 100644
--- a/test/core/xds/BUILD
+++ b/test/core/xds/BUILD
@@ -94,6 +94,12 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
+        "//:gpr",
+        "//:grpc",
+        "//test/core/test_util:grpc_test_util",
+        "//test/core/test_util:scoped_env_var",
+        "//test/cpp/util:grpc_cli_utils",
+        "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3:pkg_cc_proto",
@@ -101,12 +107,6 @@ grpc_cc_test(
         "@envoy_api//envoy/extensions/load_balancing_policies/ring_hash/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/load_balancing_policies/round_robin/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/load_balancing_policies/wrr_locality/v3:pkg_cc_proto",
-        "//:gpr",
-        "//:grpc",
-        "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto",
-        "//test/core/test_util:grpc_test_util",
-        "//test/core/test_util:scoped_env_var",
-        "//test/cpp/util:grpc_cli_utils",
     ],
 )
 
@@ -118,15 +118,15 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "@envoy_api//envoy/config/rbac/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/filters/http/rbac/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/rbac/audit_loggers/stream/v3:pkg_cc_proto",
         "//:gpr",
         "//:grpc",
-        "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto",
         "//src/core:grpc_audit_logging",
         "//test/core/test_util:grpc_test_util",
         "//test/cpp/util:grpc_cli_utils",
+        "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto",
+        "@envoy_api//envoy/config/rbac/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/http/rbac/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/rbac/audit_loggers/stream/v3:pkg_cc_proto",
     ],
 )
 
@@ -228,16 +228,16 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
-        "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto",
         "//:gpr",
         "//:grpc",
-        "@com_github_cncf_xds//udpa/type/v1:pkg_cc_proto",
-        "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto",
         "//src/core:grpc_xds_client",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
         "//test/cpp/util:grpc_cli_utils",
+        "@com_github_cncf_xds//udpa/type/v1:pkg_cc_proto",
+        "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
+        "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto",
     ],
 )
 
@@ -249,13 +249,13 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/filters/http/gcp_authn/v3:pkg_cc_proto",
         "//:gpr",
         "//:grpc",
         "//src/core:grpc_xds_client",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
+        "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/http/gcp_authn/v3:pkg_cc_proto",
     ],
 )
 
@@ -270,6 +270,12 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
+        "//:gpr",
+        "//:grpc",
+        "//test/core/test_util:grpc_test_util",
+        "//test/core/test_util:scoped_env_var",
+        "//test/cpp/util:grpc_cli_utils",
+        "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/rbac/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/common/fault/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/http/fault/v3:pkg_cc_proto",
@@ -278,14 +284,8 @@ grpc_cc_test(
         "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/http/stateful_session/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/http/stateful_session/cookie/v3:pkg_cc_proto",
-        "@envoy_api//envoy/type/v3:pkg_cc_proto",
         "@envoy_api//envoy/type/http/v3:pkg_cc_proto",
-        "//:gpr",
-        "//:grpc",
-        "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto",
-        "//test/core/test_util:grpc_test_util",
-        "//test/core/test_util:scoped_env_var",
-        "//test/cpp/util:grpc_cli_utils",
+        "@envoy_api//envoy/type/v3:pkg_cc_proto",
     ],
 )
 
@@ -297,20 +297,20 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "@envoy_api//envoy/config/listener/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/filters/http/fault/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/filters/http/rbac/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
         "//:gpr",
         "//:grpc",
         "//:grpc++_codegen_proto",
-        "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto",
         "//src/core:grpc_xds_client",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
         "//test/cpp/util:grpc_cli_utils",
+        "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto",
+        "@envoy_api//envoy/config/listener/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/http/fault/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/http/rbac/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
     ],
 )
 
@@ -322,10 +322,6 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/filters/http/fault/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/filters/http/rbac/v3:pkg_cc_proto",
-        "@envoy_api//envoy/type/v3:pkg_cc_proto",
         "//:gpr",
         "//:grpc",
         "//:grpc++_codegen_proto",
@@ -334,6 +330,10 @@ grpc_cc_test(
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
         "//test/cpp/util:grpc_cli_utils",
+        "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/http/fault/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/http/rbac/v3:pkg_cc_proto",
+        "@envoy_api//envoy/type/v3:pkg_cc_proto",
     ],
 )
 
@@ -345,22 +345,22 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
+        "//:gpr",
+        "//:grpc",
+        "//:grpc++_codegen_proto",
+        "//src/core:grpc_xds_client",
+        "//src/core:xds_health_status",
+        "//test/core/test_util:grpc_test_util",
+        "//test/core/test_util:scoped_env_var",
         "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/clusters/aggregate/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/http/gcp_authn/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/load_balancing_policies/round_robin/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/load_balancing_policies/wrr_locality/v3:pkg_cc_proto",
-        "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/transport_sockets/http_11_proxy/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/upstreams/http/v3:pkg_cc_proto",
         "@envoy_api//envoy/type/v3:pkg_cc_proto",
-        "//:gpr",
-        "//:grpc",
-        "//:grpc++_codegen_proto",
-        "//src/core:grpc_xds_client",
-        "//src/core:xds_health_status",
-        "//test/core/test_util:grpc_test_util",
-        "//test/core/test_util:scoped_env_var",
     ],
 )
 
@@ -372,7 +372,6 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
-        "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto",
         "//:gpr",
         "//:grpc",
         "//:grpc++_codegen_proto",
@@ -381,5 +380,6 @@ grpc_cc_test(
         "//src/core:xds_health_status",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
+        "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto",
     ],
 )