[reorg] move test/core/util -> test/core/test_util (#36446)

Closes #36446

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36446 from markdroth:reorg_test 5dcc85e006
PiperOrigin-RevId: 629229220

bazel/grpc_build_system.bzl

@@ -539,7 +539,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
     if language.upper() == "C":
         copts = copts + if_not_windows(["-std=c11"])
 
-    core_deps = deps + _get_external_deps(external_deps) + ["//test/core/util:grpc_suppressions"]
+    core_deps = deps + _get_external_deps(external_deps) + ["//test/core/test_util:grpc_suppressions"]
 
     # Test args for all tests
     test_args = {
@@ -617,7 +617,7 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da
         data = data,
         testonly = testonly,
         linkshared = linkshared,
-        deps = deps + _get_external_deps(external_deps) + ["//test/core/util:grpc_suppressions"],
+        deps = deps + _get_external_deps(external_deps) + ["//test/core/test_util:grpc_suppressions"],
         copts = GRPC_DEFAULT_COPTS + copts,
         linkopts = if_not_windows(["-pthread"]) + linkopts,
         tags = tags,

build_handwritten.yaml

@@ -29,7 +29,7 @@ configs:
     compile_the_world: true
     test_environ:
       ASAN_OPTIONS: detect_leaks=1:color=always
-      LSAN_OPTIONS: suppressions=test/core/util/lsan_suppressions.txt:report_objects=1
+      LSAN_OPTIONS: suppressions=test/core/test_util/lsan_suppressions.txt:report_objects=1
   asan-noleaks:
     CC: clang
     CPPFLAGS: -O0 -fsanitize-coverage=edge,trace-pc-guard -fsanitize=address -fno-omit-frame-pointer
@@ -53,7 +53,7 @@ configs:
     compile_the_world: true
     test_environ:
       ASAN_OPTIONS: detect_leaks=1:color=always
-      LSAN_OPTIONS: suppressions=test/core/util/lsan_suppressions.txt:report_objects=1
+      LSAN_OPTIONS: suppressions=test/core/test_util/lsan_suppressions.txt:report_objects=1
   c++-compat:
     CFLAGS: -Wc++-compat
     CPPFLAGS: -O0
@@ -115,7 +115,7 @@ configs:
     LDXX: clang++
     compile_the_world: true
     test_environ:
-      TSAN_OPTIONS: suppressions=test/core/util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
+      TSAN_OPTIONS: suppressions=test/core/test_util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
   ubsan:
     CC: clang
     CPPFLAGS: -O0 -stdlib=libc++ -fsanitize-coverage=edge,trace-pc-guard -fsanitize=undefined
@@ -127,7 +127,7 @@ configs:
     LDXX: clang++
     compile_the_world: true
     test_environ:
-      UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=test/core/util/ubsan_suppressions.txt
+      UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=test/core/test_util/ubsan_suppressions.txt
 defaults:
   boringssl:
     CFLAGS: -g

src/android/test/interop/app/CMakeLists.txt

@@ -114,10 +114,10 @@ add_library(grpc-interop
   ${GRPC_SRC_DIR}/test/cpp/interop/backend_metrics_lb_policy.cc
   ${GRPC_SRC_DIR}/test/cpp/interop/interop_client.h
   ${GRPC_SRC_DIR}/test/cpp/interop/interop_client.cc
-  ${GRPC_SRC_DIR}/test/core/util/histogram.h
-  ${GRPC_SRC_DIR}/test/core/util/histogram.cc
-  ${GRPC_SRC_DIR}/test/core/util/test_lb_policies.h
-  ${GRPC_SRC_DIR}/test/core/util/test_lb_policies.cc)
+  ${GRPC_SRC_DIR}/test/core/test_util/histogram.h
+  ${GRPC_SRC_DIR}/test/core/test_util/histogram.cc
+  ${GRPC_SRC_DIR}/test/core/test_util/test_lb_policies.h
+  ${GRPC_SRC_DIR}/test/core/test_util/test_lb_policies.cc)
 
 target_link_libraries(grpc-interop
   messages_proto_lib

src/objective-c/tests/BUILD

@@ -324,7 +324,7 @@ grpc_objc_testing_library(
     deps = [
         "//:gpr_platform",
         "//src/core:iomgr_port",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 

src/objective-c/tests/CFStreamTests/CFStreamClientTests.mm

@@ -35,7 +35,7 @@
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/tcp_client.h"
 #include "src/core/lib/resource_quota/api.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 static gpr_mu g_mu;
 static int g_connections_complete = 0;

src/objective-c/tests/CFStreamTests/CFStreamEndpointTests.mm

@@ -37,7 +37,7 @@
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/tcp_client.h"
 #include "src/core/lib/resource_quota/api.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #include <chrono>
 #include <future>

src/objective-c/tests/CronetTests/CronetUnitTests.mm

@@ -26,7 +26,7 @@
 #import <grpc/grpc.h>
 #import <grpc/grpc_cronet.h>
 #import "test/core/end2end/cq_verifier.h"
-#import "test/core/util/port.h"
+#import "test/core/test_util/port.h"
 
 #import <grpc/support/alloc.h>
 #import <grpc/support/log.h>
@@ -37,7 +37,7 @@
 #import "src/core/lib/gprpp/env.h"
 #import "src/core/lib/gprpp/host_port.h"
 #import "test/core/end2end/data/ssl_test_data.h"
-#import "test/core/util/test_config.h"
+#import "test/core/test_util/test_config.h"
 
 #if COCOAPODS
 #import <openssl_grpc/ssl.h>

src/objective-c/tests/EventEngineTests/CFEventEngineClientTests.mm

@@ -24,7 +24,7 @@
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
 #include "test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h"
 #include "test/core/event_engine/test_suite/tests/client_test.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 @interface EventEngineTimerTests : XCTestCase
 @end

src/objective-c/tests/EventEngineTests/CFEventEngineUnitTests.mm

@@ -24,7 +24,7 @@
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
 #include "test/core/event_engine/test_suite/tests/dns_test.h"
 #include "test/core/event_engine/test_suite/tests/timer_test.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 @interface EventEngineTimerTests : XCTestCase
 @end

test/core/address_utils/BUILD

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package")
-load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
+load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_fuzzer")
 
 licenses(["notice"])
 
@@ -33,7 +33,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -48,7 +48,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -62,7 +62,7 @@ grpc_fuzzer(
     uses_polling = False,
     deps = [
         "//:grpc",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -77,6 +77,6 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )

test/core/address_utils/parse_address_test.cc

@@ -45,7 +45,7 @@
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #ifdef GRPC_HAVE_UNIX_SOCKET
 

test/core/address_utils/parse_address_with_named_scope_id_test.cc

@@ -43,7 +43,7 @@
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/uri/uri_parser.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 static void test_grpc_parse_ipv6_parity_with_getaddrinfo(
     const char* target, const struct sockaddr_in6 result_from_getaddrinfo) {

test/core/address_utils/sockaddr_utils_test.cc

@@ -49,7 +49,7 @@
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace {
 

test/core/avl/BUILD

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package")
-load("//test/core/util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
+load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
 
 licenses(["notice"])
 
@@ -42,6 +42,6 @@ grpc_proto_fuzzer(
     uses_polling = False,
     deps = [
         "//src/core:avl",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )

test/core/backoff/BUILD

@@ -35,7 +35,7 @@ grpc_cc_test(
         "//:exec_ctx",
         "//:grpc",
         "//src/core:time",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 

test/core/backoff/backoff_test.cc

@@ -27,7 +27,7 @@
 
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc {
 namespace testing {

test/core/bad_client/bad_client.cc

@@ -46,7 +46,7 @@
 #include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/transport.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define MIN_HTTP2_FRAME_SIZE 9
 

test/core/bad_client/generate_tests.bzl

@@ -45,7 +45,7 @@ def grpc_bad_client_tests():
         language = "C++",
         testonly = 1,
         deps = [
-            "//test/core/util:grpc_test_util",
+            "//test/core/test_util:grpc_test_util",
             "//:grpc",
             "//:gpr",
             "//test/core/end2end:cq_verifier",

test/core/bad_client/tests/bad_streaming_id.cc

@@ -27,7 +27,7 @@
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define HEADER_FRAME_ID_1                                                  \
   "\x00\x00\xc9\x01\x05\x00\x00\x00\x01" /* headers: generated from        \

test/core/bad_client/tests/badreq.cc

@@ -23,7 +23,7 @@
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define PFX_STR                      \
   "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \

test/core/bad_client/tests/connection_prefix.cc

@@ -23,7 +23,7 @@
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 static void verifier(grpc_server* server, grpc_completion_queue* cq,
                      void* /*registered_method*/) {

test/core/bad_client/tests/duplicate_header.cc

@@ -28,7 +28,7 @@
 #include "src/core/lib/gprpp/time.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define PFX_STR                      \
   "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \

test/core/bad_client/tests/head_of_line_blocking.cc

@@ -31,7 +31,7 @@
 
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 static const char prefix[] =
     "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"

test/core/bad_client/tests/headers.cc

@@ -22,7 +22,7 @@
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define PFX_STR                      \
   "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \

test/core/bad_client/tests/initial_settings_frame.cc

@@ -26,7 +26,7 @@
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define PFX_STR "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
 #define ONE_SETTING_HDR "\x00\x00\x06\x04\x00\x00\x00\x00\x00"

test/core/bad_client/tests/out_of_bounds.cc

@@ -27,7 +27,7 @@
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define APPEND_BUFFER(string, to_append) \
   ((string).append((to_append), sizeof(to_append) - 1))

test/core/bad_client/tests/server_registered_method.cc

@@ -26,7 +26,7 @@
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define PFX_STR                                               \
   "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"                          \

test/core/bad_client/tests/simple_request.cc

@@ -21,7 +21,7 @@
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define PFX_STR                                                            \
   "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"                                       \

test/core/bad_client/tests/unknown_frame.cc

@@ -27,7 +27,7 @@
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 static void verifier(grpc_server* server, grpc_completion_queue* cq,
                      void* /*registered_method*/) {

test/core/bad_client/tests/window_overflow.cc

@@ -25,7 +25,7 @@
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define PFX_STR                                                            \
   "\x00\x00\x00\x04\x01\x00\x00\x00\x00"                                   \

test/core/bad_connection/BUILD

@@ -31,6 +31,6 @@ grpc_cc_binary(
         "//:grpc",
         "//:server",
         "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )

test/core/bad_connection/close_fd_test.cc

@@ -61,7 +61,7 @@
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/lib/surface/server.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 static void* tag(intptr_t t) { return reinterpret_cast<void*>(t); }
 

test/core/bad_ssl/bad_ssl_test.cc

@@ -39,8 +39,8 @@
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/port.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/port.h"
+#include "test/core/test_util/test_config.h"
 
 static void run_test(const char* target, size_t nops) {
   grpc_channel_credentials* ssl_creds =

test/core/bad_ssl/generate_tests.bzl

@@ -37,8 +37,8 @@ def grpc_bad_ssl_tests():
             "absl/log:check",
         ],
         deps = [
-            "//test/core/util:grpc_test_util",
-            "//test/core/util:grpc_test_util_base",
+            "//test/core/test_util:grpc_test_util",
+            "//test/core/test_util:grpc_test_util_base",
             "//:grpc",
         ],
     )
@@ -63,8 +63,8 @@ def grpc_bad_ssl_tests():
                 "//src/core/tsi/test_creds:server1.pem",
             ],
             deps = [
-                "//test/core/util:grpc_test_util",
-                "//test/core/util:grpc_test_util_base",
+                "//test/core/test_util:grpc_test_util",
+                "//test/core/test_util:grpc_test_util_base",
                 "//:gpr",
                 "//:grpc",
                 "//:subprocess",

test/core/bad_ssl/server_common.cc

@@ -25,8 +25,8 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
-#include "test/core/util/cmdline.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/cmdline.h"
+#include "test/core/test_util/test_config.h"
 
 // Common server implementation details for all servers in servers/.
 // There's nothing *wrong* with these servers per-se, but they are

test/core/bad_ssl/servers/alpn.cc

@@ -31,7 +31,7 @@
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/error.h"
 #include "test/core/bad_ssl/server_common.h"
-#include "test/core/util/tls_utils.h"
+#include "test/core/test_util/tls_utils.h"
 
 #define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem"
 #define SERVER_CERT_PATH "src/core/tsi/test_creds/server1.pem"

test/core/bad_ssl/servers/cert.cc

@@ -26,7 +26,7 @@
 
 #include "src/core/lib/iomgr/error.h"
 #include "test/core/bad_ssl/server_common.h"
-#include "test/core/util/tls_utils.h"
+#include "test/core/test_util/tls_utils.h"
 
 // This server will present an untrusted cert to the connecting client,
 // causing the SSL handshake to fail

test/core/channel/BUILD

@@ -27,8 +27,8 @@ grpc_cc_test(
     uses_polling = False,
     deps = [
         "//:grpc",
-        "//test/core/util:fake_stats_plugin",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:fake_stats_plugin",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -46,7 +46,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -61,7 +61,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -77,7 +77,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//src/core:closure",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -95,7 +95,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -110,7 +110,7 @@ grpc_cc_test(
     uses_polling = False,
     deps = [
         "//:grpc",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -125,7 +125,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//test/core/promise:test_context",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -141,7 +141,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -156,7 +156,7 @@ grpc_cc_test(
     uses_polling = False,
     deps = [
         "//src/core:metrics",
-        "//test/core/util:fake_stats_plugin",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:fake_stats_plugin",
+        "//test/core/test_util:grpc_test_util",
     ],
 )

test/core/channel/call_tracer_test.cc

@@ -29,8 +29,8 @@
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
-#include "test/core/util/fake_stats_plugin.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/fake_stats_plugin.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace {

test/core/channel/channel_args_test.cc

@@ -35,7 +35,7 @@
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 

test/core/channel/channel_stack_builder_test.cc

@@ -31,7 +31,7 @@
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace testing {

test/core/channel/channel_stack_test.cc

@@ -29,7 +29,7 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 static grpc_error_handle channel_init_func(grpc_channel_element* elem,
                                            grpc_channel_element_args* args) {

test/core/channel/metrics_test.cc

@@ -23,8 +23,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include "test/core/util/fake_stats_plugin.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/fake_stats_plugin.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace {

test/core/channel/minimal_stack_is_minimal_test.cc

@@ -54,7 +54,7 @@
 #include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/transport.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace {
 class FakeTransport final : public grpc_core::Transport {

test/core/channelz/BUILD

@@ -30,7 +30,7 @@ grpc_cc_test(
         "//:grpc",
         "//:grpc++",
         "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
         "//test/cpp/util:channel_trace_proto_helper",
     ],
 )
@@ -48,7 +48,7 @@ grpc_cc_test(
         "//:grpc++",
         "//src/core:channel_args",
         "//test/core/event_engine:event_engine_test_utils",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
         "//test/cpp/util:channel_trace_proto_helper",
     ],
 )
@@ -66,6 +66,6 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )

test/core/channelz/channel_trace_test.cc

@@ -36,7 +36,7 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_writer.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 #include "test/cpp/util/channel_trace_proto_helper.h"
 
 namespace grpc_core {

test/core/channelz/channelz_registry_test.cc

@@ -26,7 +26,7 @@
 #include "gtest/gtest.h"
 
 #include "src/core/channelz/channelz.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace channelz {

test/core/channelz/channelz_test.cc

@@ -50,7 +50,7 @@
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/server.h"
 #include "test/core/event_engine/event_engine_test_utils.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 #include "test/cpp/util/channel_trace_proto_helper.h"
 
 using grpc_event_engine::experimental::GetDefaultEventEngine;

test/core/client_channel/BUILD

@@ -29,7 +29,7 @@ grpc_cc_test(
         "//:grpc_client_channel",
         "//src/core:channel_args",
         "//src/core:subchannel_pool_interface",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -45,7 +45,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -62,7 +62,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -79,6 +79,6 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )

test/core/client_channel/client_channel_service_config_test.cc

@@ -29,7 +29,7 @@
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
 #include "src/core/service_config/service_config_parser.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace testing {

test/core/client_channel/client_channel_test.cc

@@ -26,7 +26,7 @@
 #include "src/core/client_channel/subchannel_pool_interface.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/resolver/endpoint_addresses.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace testing {

test/core/client_channel/retry_service_config_test.cc

@@ -32,7 +32,7 @@
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
 #include "src/core/service_config/service_config_parser.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace testing {

test/core/client_channel/retry_throttle_test.cc

@@ -20,7 +20,7 @@
 
 #include "gtest/gtest.h"
 
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace internal {

test/core/compression/BUILD

@@ -17,7 +17,7 @@ load(
     "grpc_cc_test",
     "grpc_package",
 )
-load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
+load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_fuzzer")
 
 grpc_package(name = "test/core/compression")
 
@@ -34,7 +34,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -47,7 +47,7 @@ grpc_fuzzer(
     uses_polling = False,
     deps = [
         "//:grpc",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -60,7 +60,7 @@ grpc_fuzzer(
     uses_polling = False,
     deps = [
         "//:grpc",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -74,7 +74,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
-        "//test/core/util:grpc_test_util",
-        "//test/core/util:grpc_test_util_base",
+        "//test/core/test_util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util_base",
     ],
 )

test/core/compression/compression_test.cc

@@ -28,7 +28,7 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gpr/useful.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 TEST(CompressionTest, CompressionAlgorithmParse) {
   size_t i;

test/core/compression/message_compress_test.cc

@@ -32,8 +32,8 @@
 
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "test/core/util/slice_splitter.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/slice_splitter.h"
+#include "test/core/test_util/test_config.h"
 
 typedef enum { ONE_A = 0, ONE_KB_A, ONE_MB_A, TEST_VALUE_COUNT } test_value;
 

test/core/debug/BUILD

@@ -34,6 +34,6 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )

test/core/debug/stats_test.cc

@@ -27,7 +27,7 @@
 
 #include "src/core/lib/debug/stats_data.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace testing {

test/core/end2end/BUILD

@@ -41,7 +41,7 @@ grpc_cc_library(
         "//:grpc",
         "//src/core:match",
         "//src/core:time",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -88,7 +88,7 @@ grpc_cc_library(
         "//src/core:slice_refcount",
         "//src/core:status_helper",
         "//src/core:time",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -104,7 +104,7 @@ grpc_cc_library(
         "//:grpc",
         "//:grpc_public_hdrs",
         "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -142,7 +142,7 @@ grpc_cc_library(
         "//src/core:slice",
         "//src/core:time",
         "//test/core/event_engine:event_engine_test_utils",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -189,7 +189,7 @@ grpc_cc_library(
         "//src/core:grpc_tls_credentials",
         "//src/core:grpc_transport_inproc",
         "//src/core:slice",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -229,7 +229,7 @@ grpc_cc_library(
         "//src/core:grpc_fake_credentials",
         "//src/core:iomgr_port",
         "//src/core:no_destruct",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
     alwayslink = 1,
 )
@@ -252,7 +252,7 @@ grpc_cc_library(
         "end2end_test_suites",
         "fixture_support",
         "//:config_vars",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -280,8 +280,8 @@ grpc_cc_library(
         "fixture_support",
         "//:config_vars",
         "//test/core/event_engine/fuzzing_event_engine",
-        "//test/core/util:fuzz_config_vars",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:fuzz_config_vars",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -516,7 +516,7 @@ grpc_cc_test(
         "//src/core:notification",
         "//src/core:slice",
         "//src/core:status_helper",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -532,7 +532,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc_public_hdrs",
         "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -556,7 +556,7 @@ grpc_cc_test(
         "//src/core:error",
         "//src/core:iomgr_port",
         "//src/core:resolved_address",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -589,7 +589,7 @@ grpc_cc_test(
         "//src/core:iomgr_fwd",
         "//src/core:resolved_address",
         "//src/core:time",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -603,7 +603,7 @@ grpc_cc_test(
         "//:gpr",
         "//:gpr_platform",
         "//:grpc_public_hdrs",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -614,7 +614,7 @@ grpc_cc_test(
     deps = [
         "//:event_engine_base_hdrs",
         "//:gpr",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -639,7 +639,7 @@ grpc_cc_test(
         "//:ref_counted_ptr",
         "//src/core:channel_args",
         "//src/core:grpc_service_config",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -678,7 +678,7 @@ grpc_cc_test(
         "//src/core:slice",
         "//src/core:time",
         "//test/core/event_engine:event_engine_test_utils",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -709,7 +709,7 @@ grpc_cc_test(
         "//src/core:channel_args",
         "//src/core:error",
         "//src/core:useful",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -740,7 +740,7 @@ grpc_cc_test(
         "//src/core:channel_args",
         "//src/core:error",
         "//src/core:useful",
-        "//test/core/util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util",
     ],
 )
 
@@ -750,6 +750,6 @@ grpc_proto_library(
     has_services = False,
     deps = [
         "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
-        "//test/core/util:fuzz_config_vars_proto",
+        "//test/core/test_util:fuzz_config_vars_proto",
     ],
 )

test/core/end2end/bad_server_response_test.cc

@@ -53,9 +53,9 @@
 #include "src/core/lib/iomgr/tcp_server.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/port.h"
-#include "test/core/util/test_config.h"
-#include "test/core/util/test_tcp_server.h"
+#include "test/core/test_util/port.h"
+#include "test/core/test_util/test_config.h"
+#include "test/core/test_util/test_tcp_server.h"
 
 #define HTTP1_RESP_400                       \
   "HTTP/1.0 400 Bad Request\n"               \

test/core/end2end/connection_refused_test.cc

@@ -36,8 +36,8 @@
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/port.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/port.h"
+#include "test/core/test_util/test_config.h"
 
 static void run_test(bool wait_for_ready, bool use_service_config) {
   grpc_channel* chan;

test/core/end2end/cq_verifier.cc

@@ -49,7 +49,7 @@
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/match.h"
 #include "src/core/lib/surface/event_string.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 // a set of metadata we expect to find on an event
 typedef struct metadata {

test/core/end2end/dualstack_socket_test.cc

@@ -56,8 +56,8 @@
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/port.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/port.h"
+#include "test/core/test_util/test_config.h"
 
 // This test exercises IPv4, IPv6, and dualstack sockets in various ways.
 

test/core/end2end/end2end_test_fuzzer.cc

@@ -42,7 +42,7 @@
 #include "test/core/end2end/fixtures/h2_tls_common.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
-#include "test/core/util/fuzz_config_vars.h"
+#include "test/core/test_util/fuzz_config_vars.h"
 
 using ::grpc_event_engine::experimental::FuzzingEventEngine;
 using ::grpc_event_engine::experimental::GetDefaultEventEngine;

test/core/end2end/end2end_test_fuzzer.proto

@@ -17,7 +17,7 @@ syntax = "proto3";
 package core_end2end_test_fuzzer;
 
 import "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto";
-import "test/core/util/fuzz_config_vars.proto";
+import "test/core/test_util/fuzz_config_vars.proto";
 
 message Msg {
     uint32 test_id = 1;

test/core/end2end/end2end_test_main.cc

@@ -23,7 +23,7 @@
 #include "src/core/lib/config/config_vars.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/fixtures/h2_tls_common.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 extern void EnsureSuitesLinked();

test/core/end2end/end2end_test_suites.cc

@@ -69,9 +69,9 @@
 #include "test/core/end2end/fixtures/proxy.h"
 #include "test/core/end2end/fixtures/secure_fixture.h"
 #include "test/core/end2end/fixtures/sockpair_fixture.h"
-#include "test/core/util/port.h"
-#include "test/core/util/test_config.h"
-#include "test/core/util/tls_utils.h"
+#include "test/core/test_util/port.h"
+#include "test/core/test_util/test_config.h"
+#include "test/core/test_util/tls_utils.h"
 
 // IWYU pragma: no_include <unistd.h>
 

test/core/end2end/end2end_tests.h

@@ -63,7 +63,7 @@
 #include "src/core/lib/surface/channel.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/event_engine/event_engine_test_utils.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 // Test feature flags.
 #define FEATURE_MASK_DOES_NOT_SUPPORT_RETRY (1 << 0)

test/core/end2end/fixtures/h2_oauth2_common.h

@@ -34,7 +34,7 @@
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/fixtures/secure_fixture.h"
-#include "test/core/util/tls_utils.h"
+#include "test/core/test_util/tls_utils.h"
 
 class Oauth2Fixture : public SecureFixture {
  public:

test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h

@@ -33,7 +33,7 @@
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/fixtures/secure_fixture.h"
-#include "test/core/util/tls_utils.h"
+#include "test/core/test_util/tls_utils.h"
 
 class SslCredReloadFixture : public SecureFixture {
  public:

test/core/end2end/fixtures/h2_ssl_tls_common.h

@@ -33,7 +33,7 @@
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/fixtures/secure_fixture.h"
-#include "test/core/util/tls_utils.h"
+#include "test/core/test_util/tls_utils.h"
 
 class SslTlsFixture : public SecureFixture {
  public:

test/core/end2end/fixtures/h2_tls_common.h

@@ -42,7 +42,7 @@
 #include "src/core/lib/slice/slice_internal.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/fixtures/secure_fixture.h"
-#include "test/core/util/tls_utils.h"
+#include "test/core/test_util/tls_utils.h"
 
 // For normal TLS connections.
 #define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem"

test/core/end2end/fixtures/http_proxy_fixture.cc

@@ -65,7 +65,7 @@
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/tcp_client.h"
 #include "src/core/lib/iomgr/tcp_server.h"
-#include "test/core/util/port.h"
+#include "test/core/test_util/port.h"
 
 struct grpc_end2end_http_proxy {
   grpc_end2end_http_proxy()

test/core/end2end/fixtures/proxy.cc

@@ -40,7 +40,7 @@
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/surface/call.h"
-#include "test/core/util/port.h"
+#include "test/core/test_util/port.h"
 
 struct grpc_end2end_proxy {
   grpc_end2end_proxy()

test/core/end2end/fixtures/secure_fixture.h

@@ -29,7 +29,7 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "test/core/end2end/end2end_tests.h"
-#include "test/core/util/port.h"
+#include "test/core/test_util/port.h"
 
 // Base class for a fixture that just needs to select cred types (or mutate
 // client/server channel args).

test/core/end2end/fuzzers/BUILD

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_package", "grpc_proto_library")
-load("//test/core/util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
+load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
 
 grpc_package(name = "test/core/end2end/fuzzers")
 
@@ -25,8 +25,8 @@ grpc_proto_library(
     has_services = False,
     deps = [
         "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
-        "//test/core/util:fuzz_config_vars_proto",
-        "//test/core/util:fuzzing_channel_args_proto",
+        "//test/core/test_util:fuzz_config_vars_proto",
+        "//test/core/test_util:fuzzing_channel_args_proto",
     ],
 )
 
@@ -69,10 +69,10 @@ grpc_proto_fuzzer(
         "//src/core:slice",
         "//test/core/end2end:ssl_test_data",
         "//test/core/event_engine/fuzzing_event_engine",
-        "//test/core/util:fuzz_config_vars",
-        "//test/core/util:fuzzing_channel_args",
-        "//test/core/util:grpc_test_util",
-        "//test/core/util:grpc_test_util_base",
+        "//test/core/test_util:fuzz_config_vars",
+        "//test/core/test_util:fuzzing_channel_args",
+        "//test/core/test_util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util_base",
     ],
 )
 
@@ -83,8 +83,8 @@ grpc_proto_library(
     deps = [
         "api_fuzzer_proto",
         "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
-        "//test/core/util:fuzz_config_vars_proto",
-        "//test/core/util:fuzzing_channel_args_proto",
+        "//test/core/test_util:fuzz_config_vars_proto",
+        "//test/core/test_util:fuzzing_channel_args_proto",
     ],
 )
 
@@ -97,8 +97,8 @@ grpc_cc_library(
         "//:chttp2_frame",
         "//src/core:chaotic_good_frame_header",
         "//test/core/event_engine/fuzzing_event_engine",
-        "//test/core/util:fuzzing_channel_args",
-        "//test/core/util:grpc_test_util_base",
+        "//test/core/test_util:fuzzing_channel_args",
+        "//test/core/test_util:grpc_test_util_base",
     ],
 )
 
@@ -120,9 +120,9 @@ grpc_proto_fuzzer(
         "//:grpc",
         "//src/core:channel_args",
         "//test/core/event_engine/fuzzing_event_engine",
-        "//test/core/util:fuzz_config_vars",
-        "//test/core/util:grpc_test_util",
-        "//test/core/util:grpc_test_util_base",
+        "//test/core/test_util:fuzz_config_vars",
+        "//test/core/test_util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util_base",
     ],
 )
 
@@ -139,9 +139,9 @@ grpc_cc_library(
         "//:grpc",
         "//src/core:channel_args",
         "//test/core/event_engine/fuzzing_event_engine",
-        "//test/core/util:fuzz_config_vars",
-        "//test/core/util:grpc_test_util",
-        "//test/core/util:grpc_test_util_base",
+        "//test/core/test_util:fuzz_config_vars",
+        "//test/core/test_util:grpc_test_util",
+        "//test/core/test_util:grpc_test_util_base",
     ],
 )
 

test/core/end2end/fuzzers/api_fuzzer.cc

@@ -67,8 +67,8 @@
 #include "test/core/end2end/fuzzers/fuzzing_common.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
-#include "test/core/util/fuzz_config_vars.h"
-#include "test/core/util/fuzzing_channel_args.h"
+#include "test/core/test_util/fuzz_config_vars.h"
+#include "test/core/test_util/fuzzing_channel_args.h"
 
 // IWYU pragma: no_include <google/protobuf/repeated_ptr_field.h>
 

test/core/end2end/fuzzers/api_fuzzer.proto

@@ -17,8 +17,8 @@ syntax = "proto3";
 package api_fuzzer;
 
 import "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto";
-import "test/core/util/fuzz_config_vars.proto";
-import "test/core/util/fuzzing_channel_args.proto";
+import "test/core/test_util/fuzz_config_vars.proto";
+import "test/core/test_util/fuzzing_channel_args.proto";
 
 message Empty {}
 

test/core/end2end/fuzzers/client_fuzzer.cc

@@ -41,8 +41,8 @@
 #include "test/core/end2end/fuzzers/fuzzer_input.pb.h"
 #include "test/core/end2end/fuzzers/fuzzing_common.h"
 #include "test/core/end2end/fuzzers/network_input.h"
-#include "test/core/util/fuzz_config_vars.h"
-#include "test/core/util/mock_endpoint.h"
+#include "test/core/test_util/fuzz_config_vars.h"
+#include "test/core/test_util/mock_endpoint.h"
 
 bool squelch = true;
 bool leak_check = true;

test/core/end2end/fuzzers/fuzzer_input.proto

@@ -18,8 +18,8 @@ package fuzzer_input;
 
 import "test/core/end2end/fuzzers/api_fuzzer.proto";
 import "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto";
-import "test/core/util/fuzz_config_vars.proto";
-import "test/core/util/fuzzing_channel_args.proto";
+import "test/core/test_util/fuzz_config_vars.proto";
+import "test/core/test_util/fuzzing_channel_args.proto";
 
 message Empty{};
 

test/core/end2end/fuzzers/network_input.cc

@@ -41,7 +41,7 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "test/core/end2end/fuzzers/fuzzer_input.pb.h"
-#include "test/core/util/mock_endpoint.h"
+#include "test/core/test_util/mock_endpoint.h"
 
 using grpc_event_engine::experimental::EventEngine;
 

test/core/end2end/fuzzers/network_input.h

@@ -19,7 +19,7 @@
 #include "src/core/lib/iomgr/endpoint.h"
 #include "test/core/end2end/fuzzers/fuzzer_input.pb.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
-#include "test/core/util/fuzzing_channel_args.h"
+#include "test/core/test_util/fuzzing_channel_args.h"
 
 namespace grpc_core {
 

test/core/end2end/fuzzers/server_fuzzer.cc

@@ -30,7 +30,7 @@
 #include "test/core/end2end/fuzzers/fuzzer_input.pb.h"
 #include "test/core/end2end/fuzzers/fuzzing_common.h"
 #include "test/core/end2end/fuzzers/network_input.h"
-#include "test/core/util/fuzz_config_vars.h"
+#include "test/core/test_util/fuzz_config_vars.h"
 
 bool squelch = true;
 bool leak_check = true;

test/core/end2end/goaway_server_test.cc

@@ -61,8 +61,8 @@
 #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
 #include "src/core/resolver/endpoint_addresses.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/port.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/port.h"
+#include "test/core/test_util/test_config.h"
 
 static gpr_mu g_mu;
 static int g_resolve_port = -1;

test/core/end2end/grpc_core_end2end_test.bzl

@@ -17,7 +17,7 @@ Generate one e2e test & associated fuzzer
 """
 
 load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test")
-load("//test/core/util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
+load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
 
 END2END_TEST_DATA = [
     "//src/core/tsi/test_creds:ca.pem",
@@ -86,9 +86,9 @@ def grpc_core_end2end_test(name, shard_count = 10, tags = []):
             "//src/core:stats_data",
             "//src/core:status_helper",
             "//src/core:time",
-            "//test/core/util:fake_stats_plugin",
-            "//test/core/util:grpc_test_util",
-            "//test/core/util:test_lb_policies",
+            "//test/core/test_util:fake_stats_plugin",
+            "//test/core/test_util:grpc_test_util",
+            "//test/core/test_util:test_lb_policies",
         ],
     )
 

test/core/end2end/h2_ssl_cert_test.cc

@@ -47,7 +47,7 @@
 #include "test/core/end2end/data/ssl_test_data.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/fixtures/secure_fixture.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 static std::string test_server1_key_id;
 

test/core/end2end/h2_ssl_session_reuse_test.cc

@@ -43,9 +43,9 @@
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/port.h"
-#include "test/core/util/test_config.h"
-#include "test/core/util/tls_utils.h"
+#include "test/core/test_util/port.h"
+#include "test/core/test_util/test_config.h"
+#include "test/core/test_util/tls_utils.h"
 
 #define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem"
 #define CLIENT_CERT_PATH "src/core/tsi/test_creds/client.pem"

test/core/end2end/h2_tls_peer_property_external_verifier_test.cc

@@ -43,9 +43,9 @@
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/port.h"
-#include "test/core/util/test_config.h"
-#include "test/core/util/tls_utils.h"
+#include "test/core/test_util/port.h"
+#include "test/core/test_util/test_config.h"
+#include "test/core/test_util/tls_utils.h"
 
 #define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem"
 #define CLIENT_CERT_PATH "src/core/tsi/test_creds/client.pem"

test/core/end2end/invalid_call_argument_test.cc

@@ -38,8 +38,8 @@
 
 #include "src/core/lib/gprpp/host_port.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/port.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/port.h"
+#include "test/core/test_util/test_config.h"
 
 struct test_state {
   int is_client;

test/core/end2end/multiple_server_queues_test.cc

@@ -21,7 +21,7 @@
 #include <grpc/grpc_security.h>
 #include <grpc/support/time.h>
 
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 int main(int argc, char** argv) {
   grpc_completion_queue* cq1;

test/core/end2end/no_server_test.cc

@@ -42,7 +42,7 @@
 #include "src/core/resolver/resolver.h"
 #include "src/core/service_config/service_config.h"
 #include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 void run_test(bool wait_for_ready) {
   gpr_log(GPR_INFO, "TEST: wait_for_ready=%d", wait_for_ready);

test/core/end2end/tests/cancel_after_accept.cc

@@ -29,7 +29,7 @@
 #include "src/core/lib/gprpp/time.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/tests/cancel_test_helpers.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 

test/core/end2end/tests/cancel_after_round_trip.cc

@@ -29,7 +29,7 @@
 #include "src/core/lib/gprpp/time.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/tests/cancel_test_helpers.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace {

test/core/end2end/tests/grpc_authz.cc

@@ -30,7 +30,7 @@
 #include "src/core/lib/security/authorization/authorization_policy_provider.h"
 #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h"
 #include "test/core/end2end/end2end_tests.h"
-#include "test/core/util/tls_utils.h"
+#include "test/core/test_util/tls_utils.h"
 
 namespace grpc_core {
 namespace {

test/core/end2end/tests/http2_stats.cc

@@ -51,7 +51,7 @@
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 #include "test/core/end2end/end2end_tests.h"
-#include "test/core/util/fake_stats_plugin.h"
+#include "test/core/test_util/fake_stats_plugin.h"
 
 namespace grpc_core {
 namespace {

test/core/end2end/tests/max_connection_age.cc

@@ -28,7 +28,7 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/time.h"
 #include "test/core/end2end/end2end_tests.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 #define MAX_CONNECTION_AGE_MS 500
 #define MAX_CONNECTION_AGE_GRACE_MS 2000

test/core/end2end/tests/retry_cancel_during_delay.cc

@@ -27,7 +27,7 @@
 #include "src/core/lib/gprpp/time.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/tests/cancel_test_helpers.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace {

test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc

@@ -41,7 +41,7 @@
 #include "src/core/lib/transport/transport.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/tests/cancel_test_helpers.h"
-#include "test/core/util/test_config.h"
+#include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
 namespace {