diff --git a/Hosting.sln b/Hosting.sln
index a4330f5c38..e00cee0696 100644
--- a/Hosting.sln
+++ b/Hosting.sln
@@ -24,7 +24,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hostin
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "src\Microsoft.AspNetCore.Hosting.Server.Abstractions\Microsoft.AspNetCore.Hosting.Server.Abstractions.xproj", "{FDBBA081-5248-4FC0-9E08-B46BEF3FA438}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.Testing", "src\Microsoft.AspNetCore.Server.Testing\Microsoft.AspNetCore.Server.Testing.xproj", "{3DA89347-6731-4366-80C4-548F24E8607B}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "src\Microsoft.AspNetCore.Server.IntegrationTesting\Microsoft.AspNetCore.Server.IntegrationTesting.xproj", "{3DA89347-6731-4366-80C4-548F24E8607B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9C7520A0-F2EB-411C-8BB2-80B39C937217}"
 EndProject
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/ApplicationType.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/ApplicationType.cs
similarity index 81%
rename from src/Microsoft.AspNetCore.Server.Testing/Common/ApplicationType.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/ApplicationType.cs
index a6b7e7942c..02d8715984 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/ApplicationType.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/ApplicationType.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     public enum ApplicationType
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentParameters.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentParameters.cs
index 241f53dd1e..4aa0e64f5d 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentParameters.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Parameters to control application deployment.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentResult.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentResult.cs
similarity index 92%
rename from src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentResult.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentResult.cs
index 0125fb861d..4ea3a0518d 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentResult.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentResult.cs
@@ -3,7 +3,7 @@
 
 using System.Threading;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Result of a deployment.
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.Testing
         public string ApplicationBaseUri { get; set; }
 
         /// <summary>
-        /// The folder where the application is hosted. This path can be different from the 
+        /// The folder where the application is hosted. This path can be different from the
         /// original application source location if published before deployment.
         /// </summary>
         public string ContentRoot { get; set; }
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs
index 55d827507f..3e0680ac9b 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs
@@ -8,7 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     public class RetryHelper
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/RuntimeArchitecture.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RuntimeArchitecture.cs
similarity index 80%
rename from src/Microsoft.AspNetCore.Server.Testing/Common/RuntimeArchitecture.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RuntimeArchitecture.cs
index e43f230705..1e9c868b4b 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/RuntimeArchitecture.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RuntimeArchitecture.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     public enum RuntimeArchitecture
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/RuntimeFlavor.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RuntimeFlavor.cs
similarity index 81%
rename from src/Microsoft.AspNetCore.Server.Testing/Common/RuntimeFlavor.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RuntimeFlavor.cs
index f99e08665f..510c713f59 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/RuntimeFlavor.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RuntimeFlavor.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     public enum RuntimeFlavor
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/ServerType.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/ServerType.cs
similarity index 83%
rename from src/Microsoft.AspNetCore.Server.Testing/Common/ServerType.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/ServerType.cs
index d3dec2bdf3..060c8ed0ca 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/ServerType.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/ServerType.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     public enum ServerType
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/TestUriHelper.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/TestUriHelper.cs
similarity index 95%
rename from src/Microsoft.AspNetCore.Server.Testing/Common/TestUriHelper.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/TestUriHelper.cs
index d561f79196..9aa7701f8a 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/TestUriHelper.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/TestUriHelper.cs
@@ -5,7 +5,7 @@ using System;
 using System.Net;
 using System.Net.Sockets;
 
-namespace Microsoft.AspNetCore.Server.Testing.Common
+namespace Microsoft.AspNetCore.Server.IntegrationTesting.Common
 {
     public static class TestUriHelper
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployer.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployer.cs
index d9ae18a01a..bcefabf7a1 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployer.cs
@@ -9,7 +9,7 @@ using System.Threading;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Abstract base class of all deployers with implementation of some of the common helpers.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployerFactory.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployerFactory.cs
similarity index 94%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployerFactory.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployerFactory.cs
index 3e54a1eecb..208825eddf 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployerFactory.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployerFactory.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Factory to create an appropriate deployer based on <see cref="DeploymentParameters"/>.
@@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Server.Testing
                     return new NginxDeployer(deploymentParameters, logger);
                 default:
                     throw new NotSupportedException(
-                        string.Format("Found no deployers suitable for server type '{0}' with the current runtime.", 
+                        string.Format("Found no deployers suitable for server type '{0}' with the current runtime.",
                         deploymentParameters.ServerType)
                         );
             }
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IApplicationDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IApplicationDeployer.cs
similarity index 90%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/IApplicationDeployer.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IApplicationDeployer.cs
index b8cb7708d2..671d8b5ef8 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IApplicationDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IApplicationDeployer.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Common operations on an application deployer.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISDeployer.cs
similarity index 97%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/IISDeployer.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISDeployer.cs
index 0c5903d7e4..fc274b0fca 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISDeployer.cs
@@ -6,11 +6,11 @@
 using System;
 using System.Linq;
 using System.Threading;
-using Microsoft.AspNetCore.Server.Testing.Common;
+using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
 using Microsoft.Extensions.Logging;
 using Microsoft.Web.Administration;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Deployer for IIS.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISExpressDeployer.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISExpressDeployer.cs
index c3d0540358..d7849f009e 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISExpressDeployer.cs
@@ -6,9 +6,9 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.Server.Testing.Common;
+using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Deployment helper for IISExpress.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/NginxDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/NginxDeployer.cs
similarity index 97%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/NginxDeployer.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/NginxDeployer.cs
index 1f684cb0ca..2f696cfe1a 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/NginxDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/NginxDeployer.cs
@@ -5,10 +5,10 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Net.Http;
-using Microsoft.AspNetCore.Server.Testing.Common;
+using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Deployer for Kestrel on Nginx.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/RemotePSSessionHelper.ps1 b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/RemotePSSessionHelper.ps1
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/RemotePSSessionHelper.ps1
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/RemotePSSessionHelper.ps1
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs
index 26cf6621a5..0a0f5b2cb9 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs
@@ -11,7 +11,7 @@ using System.Xml.Linq;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     public class RemoteWindowsDeployer : ApplicationDeployer
     {
@@ -306,9 +306,10 @@ namespace Microsoft.AspNetCore.Server.Testing
 
             // Copy the scripts from this assembly's embedded resources to the temp path on the machine where these
             // tests are being run
+            var assembly = typeof(RemoteWindowsDeployer).GetTypeInfo().Assembly;
             var embeddedFileProvider = new EmbeddedFileProvider(
-                typeof(RemoteWindowsDeployer).GetTypeInfo().Assembly,
-                "Microsoft.AspNetCore.Server.Testing.Deployers.RemoteWindowsDeployer");
+                assembly,
+                $"{assembly.GetName().Name}.Deployers.RemoteWindowsDeployer");
 
             var filesOnDisk = new string[embeddedFileNames.Length];
             for (var i = 0; i < embeddedFileNames.Length; i++)
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/RemoteWindowsDeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/RemoteWindowsDeploymentParameters.cs
similarity index 96%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/RemoteWindowsDeploymentParameters.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/RemoteWindowsDeploymentParameters.cs
index 472c35a6f2..61d3a49325 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/RemoteWindowsDeploymentParameters.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/RemoteWindowsDeploymentParameters.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // See License.txt in the project root for license information
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     public class RemoteWindowsDeploymentParameters : DeploymentParameters
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/StartServer.ps1 b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/StartServer.ps1
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/StartServer.ps1
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/StartServer.ps1
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/StopServer.ps1 b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/StopServer.ps1
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/RemoteWindowsDeployer/StopServer.ps1
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/StopServer.ps1
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs
index cad9fb991f..d1cf21dd1f 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs
@@ -6,10 +6,10 @@ using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using Microsoft.AspNetCore.Server.Testing.Common;
+using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Deployer for WebListener and Kestrel.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Microsoft.AspNetCore.Server.Testing.xproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.xproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Testing/Microsoft.AspNetCore.Server.Testing.xproj
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.xproj
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Testing/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Server.Testing/project.json b/src/Microsoft.AspNetCore.Server.IntegrationTesting/project.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Testing/project.json
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/project.json
diff --git a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClrAttribute.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/SkipIfCurrentRuntimeIsCoreClrAttribute.cs
similarity index 94%
rename from src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClrAttribute.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/SkipIfCurrentRuntimeIsCoreClrAttribute.cs
index 69f287b4bc..245736ad40 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClrAttribute.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/SkipIfCurrentRuntimeIsCoreClrAttribute.cs
@@ -5,7 +5,7 @@ using System;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Testing.xunit;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Skips a test if the runtime used to run the test is CoreClr.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfEnvironmentVariableNotEnabled.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/SkipIfEnvironmentVariableNotEnabled.cs
similarity index 92%
rename from src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfEnvironmentVariableNotEnabled.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/SkipIfEnvironmentVariableNotEnabled.cs
index 34e22cf908..8d54d6ac70 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfEnvironmentVariableNotEnabled.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/SkipIfEnvironmentVariableNotEnabled.cs
@@ -4,10 +4,10 @@
 using System;
 using Microsoft.AspNetCore.Testing.xunit;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
-    /// Skip test if a given environment variable is not enabled. To enable the test, set environment variable 
+    /// Skip test if a given environment variable is not enabled. To enable the test, set environment variable
     /// to "true" for the test process.
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
diff --git a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipOn32BitOSAttribute.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/SkipOn32BitOSAttribute.cs
similarity index 94%
rename from src/Microsoft.AspNetCore.Server.Testing/xunit/SkipOn32BitOSAttribute.cs
rename to src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/SkipOn32BitOSAttribute.cs
index 2b5f29ad0d..554cc63eda 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipOn32BitOSAttribute.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/SkipOn32BitOSAttribute.cs
@@ -5,7 +5,7 @@ using System;
 using System.IO;
 using Microsoft.AspNetCore.Testing.xunit;
 
-namespace Microsoft.AspNetCore.Server.Testing
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     /// <summary>
     /// Skips a 64 bit test if the current Windows OS is 32-bit.