diff --git a/MvcPrecompilation.sln b/MvcPrecompilation.sln
index 91c5e92da2..0ee22293f9 100644
--- a/MvcPrecompilation.sln
+++ b/MvcPrecompilation.sln
@@ -17,7 +17,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Mvc.Ra
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0398AFFF-505E-4283-89DA-BBD9D28B53DB}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests", "test\Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests\Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests.xproj", "{46C9A4B2-8B1C-451B-B670-C194901D66AC}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests", "test\Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests\Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests.xproj", "{46C9A4B2-8B1C-451B-B670-C194901D66AC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/ApplicationConsumingPrecompiledViews.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/ApplicationConsumingPrecompiledViews.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/ApplicationConsumingPrecompiledViews.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/ApplicationConsumingPrecompiledViews.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/ApplicationWithConfigureMvcTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/ApplicationWithConfigureMvcTest.cs
similarity index 97%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/ApplicationWithConfigureMvcTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/ApplicationWithConfigureMvcTest.cs
index 63c8225cc4..5378c97dd6 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/ApplicationWithConfigureMvcTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/ApplicationWithConfigureMvcTest.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests
+namespace Microsoft.AspNetCore.Mvc.Razor.Precompilation
 {
     public class ApplicationWithConfigureMvcTest
         : IClassFixture<ApplicationWithConfigureMvcTest.ApplicationWithConfigureMvcFixture>
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/ApplicationWithTagHelpersTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/ApplicationWithTagHelpersTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/ApplicationWithTagHelpersTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/ApplicationWithTagHelpersTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/ApplicationPaths.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/ApplicationPaths.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/ApplicationPaths.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/ApplicationPaths.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/ApplicationTestFixture.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/ApplicationTestFixture.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/ApplicationTestFixture.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/ApplicationTestFixture.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/CommandResultExtensions.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/CommandResultExtensions.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/CommandResultExtensions.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/CommandResultExtensions.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/HttpClientExtensions.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/HttpClientExtensions.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/HttpClientExtensions.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/HttpClientExtensions.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/RuntimeFlavors.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/RuntimeFlavors.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/RuntimeFlavors.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/RuntimeFlavors.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/TestEmbeddedResource.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/TestEmbeddedResource.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Infrastructure/TestEmbeddedResource.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Infrastructure/TestEmbeddedResource.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests.xproj b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests.xproj
similarity index 92%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests.xproj
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests.xproj
index 0fc55bc876..9299b84636 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests.xproj
@@ -7,7 +7,6 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>46c9a4b2-8b1c-451b-b670-c194901d66ac</ProjectGuid>
-    <RootNamespace>Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Properties/AssemblyInfo.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Properties/AssemblyInfo.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/ApplicationConsumingPrecompiledViews.Manage.Home.Index.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/ApplicationConsumingPrecompiledViews.Manage.Home.Index.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/ApplicationConsumingPrecompiledViews.Manage.Home.Index.txt
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/ApplicationConsumingPrecompiledViews.Manage.Home.Index.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/ApplicationWithConfigureMvc.Home.Index.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.Index.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/ApplicationWithConfigureMvc.Home.Index.txt
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.Index.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/ApplicationWithConfigureMvc.Home.ViewWithPreprocessor.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.ViewWithPreprocessor.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/ApplicationWithConfigureMvc.Home.ViewWithPreprocessor.txt
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.ViewWithPreprocessor.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/ApplicationWithTagHelpers.Home.ClassLibraryTagHelper.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/ApplicationWithTagHelpers.Home.ClassLibraryTagHelper.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/ApplicationWithTagHelpers.Home.ClassLibraryTagHelper.txt
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/ApplicationWithTagHelpers.Home.ClassLibraryTagHelper.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/ApplicationWithTagHelpers.Home.LocalTagHelper.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/ApplicationWithTagHelpers.Home.LocalTagHelper.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/ApplicationWithTagHelpers.Home.LocalTagHelper.txt
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/ApplicationWithTagHelpers.Home.LocalTagHelper.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/SimpleAppTest.Home.Index.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/SimpleAppTest.Home.Index.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/Resources/SimpleAppTest.Home.Index.txt
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/Resources/SimpleAppTest.Home.Index.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/SimpleAppTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/SimpleAppTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/SimpleAppTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/SimpleAppTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/project.json
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Tests/project.json
rename to test/Microsoft.AspNetCore.Mvc.Razor.Precompilation.FunctionalTests/project.json