diff --git a/core/src/test/java/io/grpc/ContextsTest.java b/core/src/test/java/io/grpc/ContextsTest.java
index 8ba135ff7d..4eb15e099f 100644
--- a/core/src/test/java/io/grpc/ContextsTest.java
+++ b/core/src/test/java/io/grpc/ContextsTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import io.grpc.internal.FakeClock;
-import io.grpc.testing.NoopServerCall;
+import io.grpc.internal.NoopServerCall;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/src/test/java/io/grpc/ServerInterceptorsTest.java b/core/src/test/java/io/grpc/ServerInterceptorsTest.java
index e9c916d0a9..0b1ecce871 100644
--- a/core/src/test/java/io/grpc/ServerInterceptorsTest.java
+++ b/core/src/test/java/io/grpc/ServerInterceptorsTest.java
@@ -30,7 +30,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 import io.grpc.MethodDescriptor.Marshaller;
 import io.grpc.MethodDescriptor.MethodType;
 import io.grpc.ServerCall.Listener;
-import io.grpc.testing.NoopServerCall;
+import io.grpc.internal.NoopServerCall;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
diff --git a/core/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java b/core/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java
index 7bbb1847dc..b7a4e37284 100644
--- a/core/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java
+++ b/core/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java
@@ -31,7 +31,7 @@ import io.grpc.ServerServiceDefinition;
 import io.grpc.ServiceDescriptor;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
-import io.grpc.testing.NoopServerCall;
+import io.grpc.internal.NoopServerCall;
 import io.grpc.testing.TestMethodDescriptors;
 import java.util.Arrays;
 import org.junit.Test;
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 5a6d513109..a97a47dabc 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.testing.NoopClientCall;
+import io.grpc.internal.NoopClientCall;
 import io.grpc.testing.integration.Messages.SimpleRequest;
 import io.grpc.testing.integration.Messages.SimpleResponse;
 import io.grpc.testing.integration.TestServiceGrpc;
diff --git a/stub/src/test/java/io/grpc/stub/ClientCallsTest.java b/stub/src/test/java/io/grpc/stub/ClientCallsTest.java
index fbb712ea9c..6cbe70e829 100644
--- a/stub/src/test/java/io/grpc/stub/ClientCallsTest.java
+++ b/stub/src/test/java/io/grpc/stub/ClientCallsTest.java
@@ -37,9 +37,9 @@ 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.ServerCalls.NoopStreamObserver;
 import io.grpc.stub.ServerCallsTest.IntegerMarshaller;
-import io.grpc.testing.NoopClientCall;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/testing/src/main/java/io/grpc/internal/NoopClientCall.java b/testing/src/main/java/io/grpc/internal/NoopClientCall.java
new file mode 100644
index 0000000000..09aac1b69b
--- /dev/null
+++ b/testing/src/main/java/io/grpc/internal/NoopClientCall.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016, gRPC Authors All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.grpc.internal;
+
+import io.grpc.ClientCall;
+import io.grpc.Metadata;
+
+/**
+ * {@link NoopClientCall} is a class that is designed for use in tests.  It is designed to be used
+ * in places where a scriptable call is necessary.  By default, all methods are noops, and designed
+ * to be overriden.
+ */
+public class NoopClientCall<ReqT, RespT> extends ClientCall<ReqT, RespT> {
+
+  /**
+   * {@link NoopClientCall.NoopClientCallListener} is a class that is designed for use in tests.
+   * It is designed to be used in places where a scriptable call listener is necessary.  By
+   * default, all methods are noops, and designed to be overriden.
+   */
+  public static class NoopClientCallListener<T> extends ClientCall.Listener<T> {
+  }
+
+  @Override
+  public void start(ClientCall.Listener<RespT> listener, Metadata headers) {}
+
+  @Override
+  public void request(int numMessages) {}
+
+  @Override
+  public void cancel(String message, Throwable cause) {}
+
+  @Override
+  public void halfClose() {}
+
+  @Override
+  public void sendMessage(ReqT message) {}
+}
diff --git a/testing/src/main/java/io/grpc/internal/NoopServerCall.java b/testing/src/main/java/io/grpc/internal/NoopServerCall.java
new file mode 100644
index 0000000000..bd9e0027d1
--- /dev/null
+++ b/testing/src/main/java/io/grpc/internal/NoopServerCall.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016, gRPC Authors All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.grpc.internal;
+
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+import io.grpc.ServerCall;
+import io.grpc.Status;
+
+/**
+ * {@link NoopServerCall} is a class that is designed for use in tests.  It is designed to be used
+ * in places where a scriptable call is necessary.  By default, all methods are noops, and designed
+ * to be overriden.
+ */
+public class NoopServerCall<ReqT, RespT> extends ServerCall<ReqT, RespT> {
+
+  /**
+   * {@link NoopServerCall.NoopServerCallListener} is a class that is designed for use in tests.
+   * It is designed to be used in places where a scriptable call listener is necessary.  By
+   * default, all methods are noops, and designed to be overriden.
+   */
+  public static class NoopServerCallListener<T> extends ServerCall.Listener<T> {
+  }
+
+  @Override
+  public void request(int numMessages) {}
+
+  @Override
+  public void sendHeaders(Metadata headers) {}
+
+  @Override
+  public void sendMessage(RespT message) {}
+
+  @Override
+  public void close(Status status, Metadata trailers) {}
+
+  @Override
+  public boolean isCancelled() {
+    return false;
+  }
+
+  @Override
+  public MethodDescriptor<ReqT, RespT> getMethodDescriptor() {
+    return null;
+  }
+}
diff --git a/testing/src/main/java/io/grpc/testing/NoopClientCall.java b/testing/src/main/java/io/grpc/testing/NoopClientCall.java
index f2b2ed9d01..50ee5778e3 100644
--- a/testing/src/main/java/io/grpc/testing/NoopClientCall.java
+++ b/testing/src/main/java/io/grpc/testing/NoopClientCall.java
@@ -24,7 +24,11 @@ import io.grpc.Metadata;
  * {@link NoopClientCall} is a class that is designed for use in tests.  It is designed to be used
  * in places where a scriptable call is necessary.  By default, all methods are noops, and designed
  * to be overriden.
+ *
+ * @deprecated moved to {@link io.grpc.internal.NoopClientCall} and for internal use only. Please
+ *             use {@link GrpcServerRule} to test on InProcess channels instead
  */
+@Deprecated
 @ExperimentalApi("https://github.com/grpc/grpc-java/issues/2234")
 public class NoopClientCall<ReqT, RespT> extends ClientCall<ReqT, RespT> {
 
@@ -33,6 +37,7 @@ public class NoopClientCall<ReqT, RespT> extends ClientCall<ReqT, RespT> {
    * It is designed to be used in places where a scriptable call listener is necessary.  By
    * default, all methods are noops, and designed to be overriden.
    */
+  @Deprecated
   public static class NoopClientCallListener<T> extends ClientCall.Listener<T> {
   }
 
@@ -51,4 +56,3 @@ public class NoopClientCall<ReqT, RespT> extends ClientCall<ReqT, RespT> {
   @Override
   public void sendMessage(ReqT message) {}
 }
-
diff --git a/testing/src/main/java/io/grpc/testing/NoopServerCall.java b/testing/src/main/java/io/grpc/testing/NoopServerCall.java
index 2ced50d048..42409598d2 100644
--- a/testing/src/main/java/io/grpc/testing/NoopServerCall.java
+++ b/testing/src/main/java/io/grpc/testing/NoopServerCall.java
@@ -26,7 +26,11 @@ import io.grpc.Status;
  * {@link NoopServerCall} is a class that is designed for use in tests.  It is designed to be used
  * in places where a scriptable call is necessary.  By default, all methods are noops, and designed
  * to be overriden.
+ *
+ * @deprecated moved to {@link io.grpc.internal.NoopServerCall} and for internal use only. Please
+ *             use {@link GrpcServerRule} to test on InProcess channels instead
  */
+@Deprecated
 @ExperimentalApi("https://github.com/grpc/grpc-java/issues/2234")
 public class NoopServerCall<ReqT, RespT> extends ServerCall<ReqT, RespT> {
 
@@ -35,6 +39,7 @@ public class NoopServerCall<ReqT, RespT> extends ServerCall<ReqT, RespT> {
    * It is designed to be used in places where a scriptable call listener is necessary.  By
    * default, all methods are noops, and designed to be overriden.
    */
+  @Deprecated
   public static class NoopServerCallListener<T> extends ServerCall.Listener<T> {
   }
 
@@ -60,4 +65,3 @@ public class NoopServerCall<ReqT, RespT> extends ServerCall<ReqT, RespT> {
     return null;
   }
 }
-