diff --git a/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj b/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj
index 0c1dfe72..95252268 100644
--- a/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj
+++ b/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Tests" />
+    <Folder Include="Infrastructure\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/AutoRest.TestServer.Tests/ITestServer.cs b/test/AutoRest.TestServer.Tests/Infrastructure/ITestServer.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/ITestServer.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/ITestServer.cs
diff --git a/test/AutoRest.TestServer.Tests/IgnoreOnTestServer.cs b/test/AutoRest.TestServer.Tests/Infrastructure/IgnoreOnTestServer.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/IgnoreOnTestServer.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/IgnoreOnTestServer.cs
diff --git a/test/AutoRest.TestServer.Tests/ProcessTracker.cs b/test/AutoRest.TestServer.Tests/Infrastructure/ProcessTracker.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/ProcessTracker.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/ProcessTracker.cs
diff --git a/test/AutoRest.TestServer.Tests/TestOptions.cs b/test/AutoRest.TestServer.Tests/Infrastructure/TestOptions.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/TestOptions.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/TestOptions.cs
diff --git a/test/AutoRest.TestServer.Tests/TestServerSession.cs b/test/AutoRest.TestServer.Tests/Infrastructure/TestServerSession.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/TestServerSession.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/TestServerSession.cs
diff --git a/test/AutoRest.TestServer.Tests/TestServerTestBase.cs b/test/AutoRest.TestServer.Tests/Infrastructure/TestServerTestBase.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/TestServerTestBase.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/TestServerTestBase.cs
diff --git a/test/AutoRest.TestServer.Tests/TestServerV1.cs b/test/AutoRest.TestServer.Tests/Infrastructure/TestServerV1.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/TestServerV1.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/TestServerV1.cs
diff --git a/test/AutoRest.TestServer.Tests/TestServerV1Test.cs b/test/AutoRest.TestServer.Tests/Infrastructure/TestServerV1Test.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/TestServerV1Test.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/TestServerV1Test.cs
diff --git a/test/AutoRest.TestServer.Tests/TestServerV2.cs b/test/AutoRest.TestServer.Tests/Infrastructure/TestServerV2.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/TestServerV2.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/TestServerV2.cs
diff --git a/test/AutoRest.TestServer.Tests/TestServerV2Test.cs b/test/AutoRest.TestServer.Tests/Infrastructure/TestServerV2Test.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/TestServerV2Test.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/TestServerV2Test.cs
diff --git a/test/AutoRest.TestServer.Tests/TestServerVersion.cs b/test/AutoRest.TestServer.Tests/Infrastructure/TestServerVersion.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/TestServerVersion.cs
rename to test/AutoRest.TestServer.Tests/Infrastructure/TestServerVersion.cs
diff --git a/test/AutoRest.TestServer.Tests/Tests/body-complex.cs b/test/AutoRest.TestServer.Tests/body-complex.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/Tests/body-complex.cs
rename to test/AutoRest.TestServer.Tests/body-complex.cs
diff --git a/test/AutoRest.TestServer.Tests/Tests/body-string.cs b/test/AutoRest.TestServer.Tests/body-string.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/Tests/body-string.cs
rename to test/AutoRest.TestServer.Tests/body-string.cs
diff --git a/test/AutoRest.TestServer.Tests/Tests/custom-baseURL.cs b/test/AutoRest.TestServer.Tests/custom-baseURL.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/Tests/custom-baseURL.cs
rename to test/AutoRest.TestServer.Tests/custom-baseURL.cs
diff --git a/test/AutoRest.TestServer.Tests/Tests/header.cs b/test/AutoRest.TestServer.Tests/header.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/Tests/header.cs
rename to test/AutoRest.TestServer.Tests/header.cs
diff --git a/test/AutoRest.TestServer.Tests/Tests/url-path-items.cs b/test/AutoRest.TestServer.Tests/url-path-items.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/Tests/url-path-items.cs
rename to test/AutoRest.TestServer.Tests/url-path-items.cs
diff --git a/test/AutoRest.TestServer.Tests/Tests/url-query.cs b/test/AutoRest.TestServer.Tests/url-query.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/Tests/url-query.cs
rename to test/AutoRest.TestServer.Tests/url-query.cs
diff --git a/test/AutoRest.TestServer.Tests/Tests/url.cs b/test/AutoRest.TestServer.Tests/url.cs
similarity index 100%
rename from test/AutoRest.TestServer.Tests/Tests/url.cs
rename to test/AutoRest.TestServer.Tests/url.cs