diff --git a/IISIntegration.sln b/IISIntegration.sln
index 9fea7aba46..0c3df371f7 100644
--- a/IISIntegration.sln
+++ b/IISIntegration.sln
@@ -18,7 +18,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "samples\IISSam
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests", "test\Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests\Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj", "{7F2F50C7-610F-4B69-B945-CA283511A587}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests", "test\FunctionalTests\FunctionalTests.csproj", "{7F2F50C7-610F-4B69-B945-CA283511A587}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}"
 EndProject
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj
rename to test/FunctionalTests/FunctionalTests.csproj
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs b/test/FunctionalTests/HelloWorldTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs
rename to test/FunctionalTests/HelloWorldTest.cs
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Helpers.cs b/test/FunctionalTests/Helpers.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Helpers.cs
rename to test/FunctionalTests/Helpers.cs
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Http.config b/test/FunctionalTests/Http.config
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Http.config
rename to test/FunctionalTests/Http.config
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Https.config b/test/FunctionalTests/Https.config
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Https.config
rename to test/FunctionalTests/Https.config
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs b/test/FunctionalTests/HttpsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs
rename to test/FunctionalTests/HttpsTest.cs
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentation.config b/test/FunctionalTests/NtlmAuthentation.config
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentation.config
rename to test/FunctionalTests/NtlmAuthentation.config
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs b/test/FunctionalTests/NtlmAuthentationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs
rename to test/FunctionalTests/NtlmAuthentationTest.cs
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs b/test/FunctionalTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs
rename to test/FunctionalTests/Properties/AssemblyInfo.cs
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/XunitLogger.cs b/test/FunctionalTests/XunitLogger.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/XunitLogger.cs
rename to test/FunctionalTests/XunitLogger.cs
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/XunitLoggerProvider.cs b/test/FunctionalTests/XunitLoggerProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/XunitLoggerProvider.cs
rename to test/FunctionalTests/XunitLoggerProvider.cs