diff --git a/src/csharp/Grpc.Api/Grpc.Api.csproj b/src/csharp/Grpc.Api/Grpc.Api.csproj
index aa6e872fe41..5d3843cd0e8 100644
--- a/src/csharp/Grpc.Api/Grpc.Api.csproj
+++ b/src/csharp/Grpc.Api/Grpc.Api.csproj
@@ -53,9 +53,6 @@
     <Compile Include="Math.cs" />
     <Compile Include="MathGrpc.cs" />
     <Compile Include="MathServiceImpl.cs" />
-    <Compile Include="Empty.cs" />
-    <Compile Include="Messages.cs" />
-    <Compile Include="TestServiceGrpc.cs" />
     <Compile Include="MathExamples.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/csharp/Grpc.Api/Empty.cs b/src/csharp/Grpc.IntegrationTesting/Empty.cs
similarity index 100%
rename from src/csharp/Grpc.Api/Empty.cs
rename to src/csharp/Grpc.IntegrationTesting/Empty.cs
diff --git a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
index 6fcee0f1261..ee2c327ebd3 100644
--- a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
+++ b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
@@ -44,6 +44,9 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Client.cs" />
+    <Compile Include="TestServiceGrpc.cs" />
+    <Compile Include="Empty.cs" />
+    <Compile Include="Messages.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/src/csharp/Grpc.Api/Messages.cs b/src/csharp/Grpc.IntegrationTesting/Messages.cs
similarity index 100%
rename from src/csharp/Grpc.Api/Messages.cs
rename to src/csharp/Grpc.IntegrationTesting/Messages.cs
diff --git a/src/csharp/Grpc.Api/TestServiceGrpc.cs b/src/csharp/Grpc.IntegrationTesting/TestServiceGrpc.cs
similarity index 99%
rename from src/csharp/Grpc.Api/TestServiceGrpc.cs
rename to src/csharp/Grpc.IntegrationTesting/TestServiceGrpc.cs
index 15700e40ac5..b71704bcc7b 100644
--- a/src/csharp/Grpc.Api/TestServiceGrpc.cs
+++ b/src/csharp/Grpc.IntegrationTesting/TestServiceGrpc.cs
@@ -33,7 +33,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Grpc.Core;