diff --git a/test/core/memory_usage/BUILD b/test/core/memory_usage/BUILD
index 63414ce422e..41aab426c18 100644
--- a/test/core/memory_usage/BUILD
+++ b/test/core/memory_usage/BUILD
@@ -20,7 +20,6 @@ licenses(["notice"])
 
 grpc_cc_library(
     name = "memstats",
-    testonly = 1,
     srcs = [
         "memstats.cc",
         "memstats.h",
@@ -41,7 +40,6 @@ grpc_cc_library(
 
 grpc_cc_binary(
     name = "memory_usage_client",
-    testonly = 1,
     srcs = ["client.cc"],
     external_deps = [
         "absl/flags:flag",
@@ -64,7 +62,6 @@ grpc_cc_binary(
 
 grpc_cc_binary(
     name = "memory_usage_server",
-    testonly = 1,
     srcs = ["server.cc"],
     external_deps = [
         "absl/flags:flag",
@@ -88,13 +85,11 @@ grpc_cc_binary(
 
 grpc_cc_binary(
     name = "memory_usage_callback_client",
-    testonly = 1,
     srcs = ["callback_client.cc"],
     external_deps = [
         "absl/flags:flag",
         "absl/flags:parse",
         "absl/time",
-        "gtest",
     ],
     tags = [
         "bazel_only",
@@ -115,12 +110,10 @@ grpc_cc_binary(
 
 grpc_cc_binary(
     name = "memory_usage_callback_server",
-    testonly = 1,
     srcs = ["callback_server.cc"],
     external_deps = [
         "absl/flags:flag",
         "absl/flags:parse",
-        "gtest",
     ],
     tags = [
         "bazel_only",
@@ -139,28 +132,49 @@ grpc_cc_binary(
     ],
 )
 
+MEMORY_USAGE_DATA = [
+    ":memory_usage_callback_client",
+    ":memory_usage_callback_server",
+    ":memory_usage_client",
+    ":memory_usage_server",
+]
+
+MEMORY_USAGE_TAGS = [
+    "bazel_only",
+    "no_mac",
+    "no_windows",
+]
+
 grpc_cc_test(
     name = "memory_usage_test",
     srcs = ["memory_usage_test.cc"],
-    data = [
-        ":memory_usage_callback_client",
-        ":memory_usage_callback_server",
-        ":memory_usage_client",
-        ":memory_usage_server",
-    ],
+    data = MEMORY_USAGE_DATA,
     external_deps = [
         "absl/algorithm:container",
         "absl/flags:flag",
         "absl/flags:parse",
     ],
     language = "C++",
-    tags = [
-        "bazel_only",
-        "no_mac",
-        "no_windows",
+    tags = MEMORY_USAGE_TAGS,
+    deps = [
+        "//:gpr",
+        "//:grpc",
+        "//test/core/util:grpc_test_util",
+        "//test/core/util:grpc_test_util_base",
     ],
-    uses_event_engine = False,
-    uses_polling = False,
+)
+
+grpc_cc_binary(
+    name = "memory_usage",
+    srcs = ["memory_usage_test.cc"],
+    data = MEMORY_USAGE_DATA,
+    external_deps = [
+        "absl/algorithm:container",
+        "absl/flags:flag",
+        "absl/flags:parse",
+    ],
+    language = "C++",
+    tags = MEMORY_USAGE_TAGS,
     deps = [
         "//:gpr",
         "//:grpc",