diff --git a/api/src/test/java/io/grpc/ContextsTest.java b/api/src/test/java/io/grpc/ContextsTest.java
index cfcfa7d498..ec9dc3929a 100644
--- a/api/src/test/java/io/grpc/ContextsTest.java
+++ b/api/src/test/java/io/grpc/ContextsTest.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import com.google.common.util.concurrent.testing.TestingExecutors;
-import io.grpc.internal.NoopServerCall;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/api/src/test/java/io/grpc/ServerInterceptorsTest.java b/api/src/test/java/io/grpc/ServerInterceptorsTest.java
index c9e426a7f9..abfb3540fe 100644
--- a/api/src/test/java/io/grpc/ServerInterceptorsTest.java
+++ b/api/src/test/java/io/grpc/ServerInterceptorsTest.java
@@ -31,7 +31,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 import io.grpc.MethodDescriptor.Marshaller;
 import io.grpc.MethodDescriptor.MethodType;
 import io.grpc.ServerCall.Listener;
-import io.grpc.internal.NoopServerCall;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
diff --git a/testing/src/main/java/io/grpc/internal/NoopClientCall.java b/api/src/testFixtures/java/io/grpc/NoopClientCall.java
similarity index 95%
rename from testing/src/main/java/io/grpc/internal/NoopClientCall.java
rename to api/src/testFixtures/java/io/grpc/NoopClientCall.java
index a81fdaeeb1..0b2b0fbada 100644
--- a/testing/src/main/java/io/grpc/internal/NoopClientCall.java
+++ b/api/src/testFixtures/java/io/grpc/NoopClientCall.java
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.internal;
-
-import io.grpc.ClientCall;
-import io.grpc.Metadata;
+package io.grpc;
 
 /**
  * {@link NoopClientCall} is a class that is designed for use in tests.  It is designed to be used
diff --git a/testing/src/main/java/io/grpc/internal/NoopServerCall.java b/api/src/testFixtures/java/io/grpc/NoopServerCall.java
similarity index 92%
rename from testing/src/main/java/io/grpc/internal/NoopServerCall.java
rename to api/src/testFixtures/java/io/grpc/NoopServerCall.java
index 45038198fa..f401085163 100644
--- a/testing/src/main/java/io/grpc/internal/NoopServerCall.java
+++ b/api/src/testFixtures/java/io/grpc/NoopServerCall.java
@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.internal;
-
-import io.grpc.Metadata;
-import io.grpc.MethodDescriptor;
-import io.grpc.ServerCall;
-import io.grpc.Status;
+package io.grpc;
 
 /**
  * {@link NoopServerCall} is a class that is designed for use in tests.  It is designed to be used
diff --git a/core/src/test/java/io/grpc/internal/ClientCallImplTest.java b/core/src/test/java/io/grpc/internal/ClientCallImplTest.java
index fb17c97417..d41f2113f5 100644
--- a/core/src/test/java/io/grpc/internal/ClientCallImplTest.java
+++ b/core/src/test/java/io/grpc/internal/ClientCallImplTest.java
@@ -59,6 +59,7 @@ import io.grpc.InternalConfigSelector;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.MethodDescriptor.MethodType;
+import io.grpc.NoopClientCall;
 import io.grpc.Status;
 import io.grpc.internal.ClientCallImpl.ClientStreamProvider;
 import io.grpc.internal.ManagedChannelServiceConfig.MethodInfo;
diff --git a/core/src/test/java/io/grpc/internal/ConfigSelectingClientCallTest.java b/core/src/test/java/io/grpc/internal/ConfigSelectingClientCallTest.java
index 85fe7d30b8..eda265e0ff 100644
--- a/core/src/test/java/io/grpc/internal/ConfigSelectingClientCallTest.java
+++ b/core/src/test/java/io/grpc/internal/ConfigSelectingClientCallTest.java
@@ -31,6 +31,7 @@ import io.grpc.InternalConfigSelector;
 import io.grpc.LoadBalancer.PickSubchannelArgs;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
+import io.grpc.NoopClientCall;
 import io.grpc.Status;
 import io.grpc.internal.ManagedChannelImpl.ConfigSelectingClientCall;
 import io.grpc.internal.ManagedChannelServiceConfig.MethodInfo;
diff --git a/core/src/test/java/io/grpc/internal/ForwardingManagedChannelTest.java b/core/src/test/java/io/grpc/internal/ForwardingManagedChannelTest.java
index 60405e2279..b148bd6aee 100644
--- a/core/src/test/java/io/grpc/internal/ForwardingManagedChannelTest.java
+++ b/core/src/test/java/io/grpc/internal/ForwardingManagedChannelTest.java
@@ -28,6 +28,7 @@ import io.grpc.ConnectivityState;
 import io.grpc.ForwardingTestUtil;
 import io.grpc.ManagedChannel;
 import io.grpc.MethodDescriptor;
+import io.grpc.NoopClientCall;
 import io.grpc.testing.TestMethodDescriptors;
 import java.lang.reflect.Method;
 import java.util.Collections;
diff --git a/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingChannelInterceptorTest.java b/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingChannelInterceptorTest.java
index 7a9aadc2d1..6594876ff5 100644
--- a/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingChannelInterceptorTest.java
+++ b/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingChannelInterceptorTest.java
@@ -47,9 +47,9 @@ import io.grpc.Grpc;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.MethodDescriptor.MethodType;
+import io.grpc.NoopClientCall;
 import io.grpc.Status;
 import io.grpc.gcp.observability.interceptors.ConfigFilterHelper.FilterParams;
-import io.grpc.internal.NoopClientCall;
 import io.grpc.observabilitylog.v1.GrpcLogRecord;
 import io.grpc.observabilitylog.v1.GrpcLogRecord.EventLogger;
 import io.grpc.observabilitylog.v1.GrpcLogRecord.EventType;
diff --git a/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingServerInterceptorTest.java b/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingServerInterceptorTest.java
index f55476e034..5bc8323e6e 100644
--- a/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingServerInterceptorTest.java
+++ b/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingServerInterceptorTest.java
@@ -39,10 +39,10 @@ import io.grpc.Grpc;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.MethodDescriptor.MethodType;
+import io.grpc.NoopServerCall;
 import io.grpc.ServerCall;
 import io.grpc.Status;
 import io.grpc.gcp.observability.interceptors.ConfigFilterHelper.FilterParams;
-import io.grpc.internal.NoopServerCall;
 import io.grpc.observabilitylog.v1.GrpcLogRecord.EventLogger;
 import io.grpc.observabilitylog.v1.GrpcLogRecord.EventType;
 import io.opencensus.trace.SpanContext;
diff --git a/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java b/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java
index 47970873a6..82e6f3e83a 100644
--- a/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java
+++ b/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java
@@ -30,7 +30,7 @@ import io.grpc.Channel;
 import io.grpc.ClientCall;
 import io.grpc.Deadline;
 import io.grpc.MethodDescriptor;
-import io.grpc.internal.NoopClientCall;
+import io.grpc.NoopClientCall;
 import io.grpc.testing.integration.Messages.SimpleRequest;
 import io.grpc.testing.integration.Messages.SimpleResponse;
 import io.grpc.testing.integration.TestServiceGrpc;
diff --git a/services/build.gradle b/services/build.gradle
index 7bc55fdd97..c9db8a09c4 100644
--- a/services/build.gradle
+++ b/services/build.gradle
@@ -36,7 +36,8 @@ dependencies {
     compileOnly libraries.javax.annotation
     testImplementation project(':grpc-testing'),
             libraries.netty.transport.epoll, // for DomainSocketAddress
-            testFixtures(project(':grpc-core'))
+            testFixtures(project(':grpc-core')),
+            testFixtures(project(':grpc-api'))
     testCompileOnly libraries.javax.annotation
     signature libraries.signature.java
 }
diff --git a/services/src/test/java/io/grpc/protobuf/services/BinaryLogProviderTest.java b/services/src/test/java/io/grpc/protobuf/services/BinaryLogProviderTest.java
index 53f361c83e..2d2b7651c0 100644
--- a/services/src/test/java/io/grpc/protobuf/services/BinaryLogProviderTest.java
+++ b/services/src/test/java/io/grpc/protobuf/services/BinaryLogProviderTest.java
@@ -35,12 +35,12 @@ import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.MethodDescriptor.Marshaller;
 import io.grpc.MethodDescriptor.MethodType;
+import io.grpc.NoopClientCall;
+import io.grpc.NoopServerCall;
 import io.grpc.ServerCall;
 import io.grpc.ServerCallHandler;
 import io.grpc.ServerInterceptor;
 import io.grpc.ServerMethodDefinition;
-import io.grpc.internal.NoopClientCall;
-import io.grpc.internal.NoopServerCall;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java b/services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java
index 7b5b218230..856029bc75 100644
--- a/services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java
+++ b/services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java
@@ -54,6 +54,8 @@ import io.grpc.Grpc;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.MethodDescriptor.MethodType;
+import io.grpc.NoopClientCall;
+import io.grpc.NoopServerCall;
 import io.grpc.ServerCall;
 import io.grpc.ServerCallHandler;
 import io.grpc.Status;
@@ -67,8 +69,6 @@ import io.grpc.binarylog.v1.Message;
 import io.grpc.binarylog.v1.MetadataEntry;
 import io.grpc.binarylog.v1.ServerHeader;
 import io.grpc.binarylog.v1.Trailer;
-import io.grpc.internal.NoopClientCall;
-import io.grpc.internal.NoopServerCall;
 import io.grpc.protobuf.StatusProto;
 import io.grpc.protobuf.services.BinlogHelper.FactoryImpl;
 import io.grpc.protobuf.services.BinlogHelper.MaybeTruncated;
diff --git a/stub/build.gradle b/stub/build.gradle
index 971e476fb3..eeebf0891b 100644
--- a/stub/build.gradle
+++ b/stub/build.gradle
@@ -19,7 +19,8 @@ dependencies {
         libraries.guava
     implementation libraries.errorprone.annotations
     testImplementation libraries.truth,
-            project(':grpc-testing')
+            project(':grpc-testing'),
+            testFixtures(project(':grpc-api'))
     signature libraries.signature.java
     signature libraries.signature.android
 }
diff --git a/stub/src/test/java/io/grpc/stub/ClientCallsTest.java b/stub/src/test/java/io/grpc/stub/ClientCallsTest.java
index edd704ee74..28801874ea 100644
--- a/stub/src/test/java/io/grpc/stub/ClientCallsTest.java
+++ b/stub/src/test/java/io/grpc/stub/ClientCallsTest.java
@@ -39,6 +39,7 @@ import io.grpc.ForwardingClientCallListener.SimpleForwardingClientCallListener;
 import io.grpc.ManagedChannel;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
+import io.grpc.NoopClientCall;
 import io.grpc.Server;
 import io.grpc.ServerServiceDefinition;
 import io.grpc.ServiceDescriptor;
@@ -46,7 +47,6 @@ import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.grpc.inprocess.InProcessChannelBuilder;
 import io.grpc.inprocess.InProcessServerBuilder;
-import io.grpc.internal.NoopClientCall;
 import io.grpc.stub.ClientCalls.StubType;
 import io.grpc.stub.ServerCalls.NoopStreamObserver;
 import io.grpc.stub.ServerCalls.ServerStreamingMethod;
diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel
index 071a9650b1..974cb32f75 100644
--- a/testing/BUILD.bazel
+++ b/testing/BUILD.bazel
@@ -21,16 +21,3 @@ java_library(
         "@junit_junit//jar",
     ],
 )
-
-java_library(
-    name = "internal",
-    srcs = glob([
-        "src/main/java/io/grpc/internal/*.java",
-    ]),
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "//api",
-        "//core:internal",
-        "@io_opencensus_opencensus_api//jar",
-    ],
-)
diff --git a/util/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java b/util/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java
index 8f94107394..cfd1d1354f 100644
--- a/util/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java
+++ b/util/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
 
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
+import io.grpc.NoopServerCall;
 import io.grpc.ServerCall;
 import io.grpc.ServerCallHandler;
 import io.grpc.ServerInterceptors;
@@ -29,7 +30,6 @@ import io.grpc.ServerServiceDefinition;
 import io.grpc.ServiceDescriptor;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
-import io.grpc.internal.NoopServerCall;
 import io.grpc.testing.TestMethodDescriptors;
 import java.util.Arrays;
 import org.junit.Test;
diff --git a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
index 9865b60172..885e2d3e12 100644
--- a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
+++ b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
@@ -57,6 +57,8 @@ import io.grpc.NameResolver;
 import io.grpc.NameResolver.ConfigOrError;
 import io.grpc.NameResolver.ResolutionResult;
 import io.grpc.NameResolver.ServiceConfigParser;
+import io.grpc.NoopClientCall;
+import io.grpc.NoopClientCall.NoopClientCallListener;
 import io.grpc.Status;
 import io.grpc.Status.Code;
 import io.grpc.SynchronizationContext;
@@ -64,8 +66,6 @@ import io.grpc.internal.AutoConfiguredLoadBalancerFactory;
 import io.grpc.internal.FakeClock;
 import io.grpc.internal.JsonParser;
 import io.grpc.internal.JsonUtil;
-import io.grpc.internal.NoopClientCall;
-import io.grpc.internal.NoopClientCall.NoopClientCallListener;
 import io.grpc.internal.ObjectPool;
 import io.grpc.internal.PickSubchannelArgsImpl;
 import io.grpc.internal.ScParser;