diff --git a/src/ServerTests/test/test/Directory.Build.props b/src/ServerTests/test/Directory.Build.props
similarity index 100%
rename from src/ServerTests/test/test/Directory.Build.props
rename to src/ServerTests/test/Directory.Build.props
diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/HelloWorldTest.cs b/src/ServerTests/test/ServerComparison.FunctionalTests/HelloWorldTest.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.FunctionalTests/HelloWorldTest.cs
rename to src/ServerTests/test/ServerComparison.FunctionalTests/HelloWorldTest.cs
diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/Helpers.cs b/src/ServerTests/test/ServerComparison.FunctionalTests/Helpers.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.FunctionalTests/Helpers.cs
rename to src/ServerTests/test/ServerComparison.FunctionalTests/Helpers.cs
diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/NoCompression.conf b/src/ServerTests/test/ServerComparison.FunctionalTests/NoCompression.conf
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.FunctionalTests/NoCompression.conf
rename to src/ServerTests/test/ServerComparison.FunctionalTests/NoCompression.conf
diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs b/src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs
rename to src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs
diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/Properties/AssemblyInfo.cs b/src/ServerTests/test/ServerComparison.FunctionalTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.FunctionalTests/Properties/AssemblyInfo.cs
rename to src/ServerTests/test/ServerComparison.FunctionalTests/Properties/AssemblyInfo.cs
diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs b/src/ServerTests/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs
rename to src/ServerTests/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs
diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseTests.cs b/src/ServerTests/test/ServerComparison.FunctionalTests/ResponseTests.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseTests.cs
rename to src/ServerTests/test/ServerComparison.FunctionalTests/ResponseTests.cs
diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/ServerTests/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj
rename to src/ServerTests/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj
diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/nginx.conf b/src/ServerTests/test/ServerComparison.FunctionalTests/nginx.conf
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.FunctionalTests/nginx.conf
rename to src/ServerTests/test/ServerComparison.FunctionalTests/nginx.conf
diff --git a/src/ServerTests/test/test/ServerComparison.TestSites/Program.cs b/src/ServerTests/test/ServerComparison.TestSites/Program.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.TestSites/Program.cs
rename to src/ServerTests/test/ServerComparison.TestSites/Program.cs
diff --git a/src/ServerTests/test/test/ServerComparison.TestSites/Properties/launchSettings.json b/src/ServerTests/test/ServerComparison.TestSites/Properties/launchSettings.json
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.TestSites/Properties/launchSettings.json
rename to src/ServerTests/test/ServerComparison.TestSites/Properties/launchSettings.json
diff --git a/src/ServerTests/test/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/ServerTests/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj
rename to src/ServerTests/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj
diff --git a/src/ServerTests/test/test/ServerComparison.TestSites/Startup.cs b/src/ServerTests/test/ServerComparison.TestSites/Startup.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.TestSites/Startup.cs
rename to src/ServerTests/test/ServerComparison.TestSites/Startup.cs
diff --git a/src/ServerTests/test/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs b/src/ServerTests/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs
rename to src/ServerTests/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs
diff --git a/src/ServerTests/test/test/ServerComparison.TestSites/StartupResponseCompression.cs b/src/ServerTests/test/ServerComparison.TestSites/StartupResponseCompression.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.TestSites/StartupResponseCompression.cs
rename to src/ServerTests/test/ServerComparison.TestSites/StartupResponseCompression.cs
diff --git a/src/ServerTests/test/test/ServerComparison.TestSites/StartupResponses.cs b/src/ServerTests/test/ServerComparison.TestSites/StartupResponses.cs
similarity index 100%
rename from src/ServerTests/test/test/ServerComparison.TestSites/StartupResponses.cs
rename to src/ServerTests/test/ServerComparison.TestSites/StartupResponses.cs
diff --git a/src/ServerTests/test/test/aspnetcore_schema.xml b/src/ServerTests/test/aspnetcore_schema.xml
similarity index 100%
rename from src/ServerTests/test/test/aspnetcore_schema.xml
rename to src/ServerTests/test/aspnetcore_schema.xml
diff --git a/src/ServerTests/test/test/aspnetcore_schema_v2.xml b/src/ServerTests/test/aspnetcore_schema_v2.xml
similarity index 100%
rename from src/ServerTests/test/test/aspnetcore_schema_v2.xml
rename to src/ServerTests/test/aspnetcore_schema_v2.xml
diff --git a/src/ServerTests/test/test/update_schema.ps1 b/src/ServerTests/test/update_schema.ps1
similarity index 100%
rename from src/ServerTests/test/test/update_schema.ps1
rename to src/ServerTests/test/update_schema.ps1