diff --git a/Microsoft.AspNetCore.Sockets.sln b/Microsoft.AspNetCore.Sockets.sln
index e8d27466ec..8684880b97 100644
--- a/Microsoft.AspNetCore.Sockets.sln
+++ b/Microsoft.AspNetCore.Sockets.sln
@@ -23,9 +23,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6A35B453-5
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Sockets.Tests", "test\Microsoft.AspNetCore.Sockets.Tests\Microsoft.AspNetCore.Sockets.Tests.xproj", "{AAD719D5-5E31-4ED1-A60F-6EB92EFA66D9}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.WebSockets", "src\Microsoft.Extensions.WebSockets\Microsoft.Extensions.WebSockets.xproj", "{5D9DA986-2EAB-4C6D-BF15-9A4BDD4DE775}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.WebSockets.Internal", "src\Microsoft.Extensions.WebSockets.Internal\Microsoft.Extensions.WebSockets.Internal.xproj", "{5D9DA986-2EAB-4C6D-BF15-9A4BDD4DE775}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.WebSockets.Tests", "test\Microsoft.Extensions.WebSockets.Tests\Microsoft.Extensions.WebSockets.Tests.xproj", "{8FA6BE8F-B5EB-42F9-9B16-101917CC45E2}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.WebSockets.Internal.Tests", "test\Microsoft.Extensions.WebSockets.Internal.Tests\Microsoft.Extensions.WebSockets.Internal.Tests.xproj", "{A7050BAE-3DB9-4FB3-A49D-303201415B13}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -53,10 +53,10 @@ Global
 		{5D9DA986-2EAB-4C6D-BF15-9A4BDD4DE775}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D9DA986-2EAB-4C6D-BF15-9A4BDD4DE775}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D9DA986-2EAB-4C6D-BF15-9A4BDD4DE775}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8FA6BE8F-B5EB-42F9-9B16-101917CC45E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FA6BE8F-B5EB-42F9-9B16-101917CC45E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FA6BE8F-B5EB-42F9-9B16-101917CC45E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8FA6BE8F-B5EB-42F9-9B16-101917CC45E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7050BAE-3DB9-4FB3-A49D-303201415B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7050BAE-3DB9-4FB3-A49D-303201415B13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7050BAE-3DB9-4FB3-A49D-303201415B13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7050BAE-3DB9-4FB3-A49D-303201415B13}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +67,6 @@ Global
 		{BA99C2A1-48F9-4FA5-B95A-9687A73B7CC9} = {C4BC9889-B49F-41B6-806B-F84941B2549B}
 		{AAD719D5-5E31-4ED1-A60F-6EB92EFA66D9} = {6A35B453-52EC-48AF-89CA-D4A69800F131}
 		{5D9DA986-2EAB-4C6D-BF15-9A4BDD4DE775} = {DA69F624-5398-4884-87E4-B816698CDE65}
-		{8FA6BE8F-B5EB-42F9-9B16-101917CC45E2} = {6A35B453-52EC-48AF-89CA-D4A69800F131}
+		{A7050BAE-3DB9-4FB3-A49D-303201415B13} = {6A35B453-52EC-48AF-89CA-D4A69800F131}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Microsoft.Extensions.WebSockets/Internal/ChannelExtensions.cs b/src/Microsoft.Extensions.WebSockets.Internal/ChannelExtensions.cs
similarity index 97%
rename from src/Microsoft.Extensions.WebSockets/Internal/ChannelExtensions.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/ChannelExtensions.cs
index 41c5790955..8fa61fe247 100644
--- a/src/Microsoft.Extensions.WebSockets/Internal/ChannelExtensions.cs
+++ b/src/Microsoft.Extensions.WebSockets.Internal/ChannelExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Buffers;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using Channels;
 
diff --git a/src/Microsoft.Extensions.WebSockets/IWebSocketConnection.cs b/src/Microsoft.Extensions.WebSockets.Internal/IWebSocketConnection.cs
similarity index 97%
rename from src/Microsoft.Extensions.WebSockets/IWebSocketConnection.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/IWebSocketConnection.cs
index a1d0f50df4..0befc266e9 100644
--- a/src/Microsoft.Extensions.WebSockets/IWebSocketConnection.cs
+++ b/src/Microsoft.Extensions.WebSockets.Internal/IWebSocketConnection.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.Extensions.WebSockets
+namespace Microsoft.Extensions.WebSockets.Internal
 {
     /// <summary>
     /// Represents a connection to a WebSocket endpoint.
@@ -75,7 +75,8 @@ namespace Microsoft.Extensions.WebSockets
         /// <param name="messageHandler">The callback that will be invoked for each new frame</param>
         /// <returns>A <see cref="Task{WebSocketCloseResult}"/> that will complete when the client has sent a close frame, or the connection has been terminated</returns>
         public static Task<WebSocketCloseResult> ExecuteAsync(this IWebSocketConnection self, Action<WebSocketFrame> messageHandler) =>
-            self.ExecuteAsync((frame, _) => {
+            self.ExecuteAsync((frame, _) =>
+            {
                 messageHandler(frame);
                 return Task.CompletedTask;
             }, null);
@@ -86,7 +87,8 @@ namespace Microsoft.Extensions.WebSockets
         /// <param name="messageHandler">The callback that will be invoked for each new frame</param>
         /// <returns>A <see cref="Task{WebSocketCloseResult}"/> that will complete when the client has sent a close frame, or the connection has been terminated</returns>
         public static Task<WebSocketCloseResult> ExecuteAsync(this IWebSocketConnection self, Action<WebSocketFrame, object> messageHandler, object state) =>
-            self.ExecuteAsync((frame, s) => {
+            self.ExecuteAsync((frame, s) =>
+            {
                 messageHandler(frame, s);
                 return Task.CompletedTask;
             }, state);
diff --git a/src/Microsoft.Extensions.WebSockets/MaskingUtilities.cs b/src/Microsoft.Extensions.WebSockets.Internal/MaskingUtilities.cs
similarity index 97%
rename from src/Microsoft.Extensions.WebSockets/MaskingUtilities.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/MaskingUtilities.cs
index 83db09c3dc..fea43ff40b 100644
--- a/src/Microsoft.Extensions.WebSockets/MaskingUtilities.cs
+++ b/src/Microsoft.Extensions.WebSockets.Internal/MaskingUtilities.cs
@@ -2,7 +2,7 @@
 using System.Binary;
 using Channels;
 
-namespace Microsoft.Extensions.WebSockets
+namespace Microsoft.Extensions.WebSockets.Internal
 {
     internal static class MaskingUtilities
     {
diff --git a/src/Microsoft.Extensions.WebSockets/Microsoft.Extensions.WebSockets.xproj b/src/Microsoft.Extensions.WebSockets.Internal/Microsoft.Extensions.WebSockets.Internal.xproj
similarity index 100%
rename from src/Microsoft.Extensions.WebSockets/Microsoft.Extensions.WebSockets.xproj
rename to src/Microsoft.Extensions.WebSockets.Internal/Microsoft.Extensions.WebSockets.Internal.xproj
diff --git a/src/Microsoft.Extensions.WebSockets/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.WebSockets.Internal/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.Extensions.WebSockets/Properties/AssemblyInfo.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.Extensions.WebSockets/WebSocketCloseResult.cs b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketCloseResult.cs
similarity index 97%
rename from src/Microsoft.Extensions.WebSockets/WebSocketCloseResult.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/WebSocketCloseResult.cs
index ad14a1b2db..a44dd573d6 100644
--- a/src/Microsoft.Extensions.WebSockets/WebSocketCloseResult.cs
+++ b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketCloseResult.cs
@@ -3,7 +3,7 @@ using System.Text;
 using Channels;
 using Channels.Text.Primitives;
 
-namespace Microsoft.Extensions.WebSockets
+namespace Microsoft.Extensions.WebSockets.Internal
 {
     /// <summary>
     /// Represents the payload of a Close frame (i.e. a <see cref="WebSocketFrame"/> with an <see cref="WebSocketFrame.Opcode"/> of <see cref="WebSocketOpcode.Close"/>).
diff --git a/src/Microsoft.Extensions.WebSockets/WebSocketCloseStatus.cs b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketCloseStatus.cs
similarity index 98%
rename from src/Microsoft.Extensions.WebSockets/WebSocketCloseStatus.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/WebSocketCloseStatus.cs
index 2ee3e322e9..33fd343423 100644
--- a/src/Microsoft.Extensions.WebSockets/WebSocketCloseStatus.cs
+++ b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketCloseStatus.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.Extensions.WebSockets
+namespace Microsoft.Extensions.WebSockets.Internal
 {
     /// <summary>
     /// Represents well-known WebSocket Close frame status codes.
diff --git a/src/Microsoft.Extensions.WebSockets/WebSocketConnection.cs b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketConnection.cs
similarity index 99%
rename from src/Microsoft.Extensions.WebSockets/WebSocketConnection.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/WebSocketConnection.cs
index 4a04493fb8..237bcd2d6c 100644
--- a/src/Microsoft.Extensions.WebSockets/WebSocketConnection.cs
+++ b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketConnection.cs
@@ -5,9 +5,8 @@ using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
 using Channels;
-using Microsoft.Extensions.WebSockets.Internal;
 
-namespace Microsoft.Extensions.WebSockets
+namespace Microsoft.Extensions.WebSockets.Internal
 {
     /// <summary>
     /// Provides the default implementation of <see cref="IWebSocketConnection"/>.
diff --git a/src/Microsoft.Extensions.WebSockets/WebSocketConnectionState.cs b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketConnectionState.cs
similarity index 51%
rename from src/Microsoft.Extensions.WebSockets/WebSocketConnectionState.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/WebSocketConnectionState.cs
index 90b77296d3..e84cead104 100644
--- a/src/Microsoft.Extensions.WebSockets/WebSocketConnectionState.cs
+++ b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketConnectionState.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.WebSockets
+namespace Microsoft.Extensions.WebSockets.Internal
 {
     public enum WebSocketConnectionState
     {
diff --git a/src/Microsoft.Extensions.WebSockets/WebSocketException.cs b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketException.cs
similarity index 100%
rename from src/Microsoft.Extensions.WebSockets/WebSocketException.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/WebSocketException.cs
diff --git a/src/Microsoft.Extensions.WebSockets/WebSocketFrame.cs b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketFrame.cs
similarity index 90%
rename from src/Microsoft.Extensions.WebSockets/WebSocketFrame.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/WebSocketFrame.cs
index 4a55af6a73..adc8721043 100644
--- a/src/Microsoft.Extensions.WebSockets/WebSocketFrame.cs
+++ b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketFrame.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Text;
-using Channels;
+using Channels;
 
-namespace Microsoft.Extensions.WebSockets
+namespace Microsoft.Extensions.WebSockets.Internal
 {
     /// <summary>
     /// Represents a single Frame received or sent on a <see cref="IWebSocketConnection"/>.
diff --git a/src/Microsoft.Extensions.WebSockets/WebSocketOpcode.cs b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketOpcode.cs
similarity index 95%
rename from src/Microsoft.Extensions.WebSockets/WebSocketOpcode.cs
rename to src/Microsoft.Extensions.WebSockets.Internal/WebSocketOpcode.cs
index 6e59e2264c..4840bbcb45 100644
--- a/src/Microsoft.Extensions.WebSockets/WebSocketOpcode.cs
+++ b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketOpcode.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.Extensions.WebSockets
+namespace Microsoft.Extensions.WebSockets.Internal
 {
     /// <summary>
     /// Represents the possible values for the "opcode" field of a WebSocket frame.
diff --git a/src/Microsoft.Extensions.WebSockets/project.json b/src/Microsoft.Extensions.WebSockets.Internal/project.json
similarity index 100%
rename from src/Microsoft.Extensions.WebSockets/project.json
rename to src/Microsoft.Extensions.WebSockets.Internal/project.json
diff --git a/test/Microsoft.Extensions.WebSockets.Tests/Microsoft.Extensions.WebSockets.Tests.xproj b/test/Microsoft.Extensions.WebSockets.Internal.Tests/Microsoft.Extensions.WebSockets.Internal.Tests.xproj
similarity index 87%
rename from test/Microsoft.Extensions.WebSockets.Tests/Microsoft.Extensions.WebSockets.Tests.xproj
rename to test/Microsoft.Extensions.WebSockets.Internal.Tests/Microsoft.Extensions.WebSockets.Internal.Tests.xproj
index 33a56191b0..5739b5f12a 100644
--- a/test/Microsoft.Extensions.WebSockets.Tests/Microsoft.Extensions.WebSockets.Tests.xproj
+++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/Microsoft.Extensions.WebSockets.Internal.Tests.xproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>8fa6be8f-b5eb-42f9-9b16-101917cc45e2</ProjectGuid>
-    <RootNamespace>Microsoft.Extensions.WebSockets.Tests</RootNamespace>
+    <ProjectGuid>a7050bae-3db9-4fb3-a49d-303201415b13</ProjectGuid>
+    <RootNamespace>Microsoft.Extensions.WebSockets.Internal.Tests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
diff --git a/test/Microsoft.Extensions.WebSockets.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.Extensions.WebSockets.Internal.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/Microsoft.Extensions.WebSockets.Tests/Properties/AssemblyInfo.cs
rename to test/Microsoft.Extensions.WebSockets.Internal.Tests/Properties/AssemblyInfo.cs
diff --git a/test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionExtensions.cs b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionExtensions.cs
similarity index 93%
rename from test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionExtensions.cs
rename to test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionExtensions.cs
index 7e69797eac..199a5b6dae 100644
--- a/test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionExtensions.cs
+++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionExtensions.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Channels;
 
-namespace Microsoft.Extensions.WebSockets.Tests
+namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public static class WebSocketConnectionExtensions
     {
diff --git a/test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionSummary.cs b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionSummary.cs
similarity index 87%
rename from test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionSummary.cs
rename to test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionSummary.cs
index 675aa72499..a488a51a27 100644
--- a/test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionSummary.cs
+++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionSummary.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Microsoft.Extensions.WebSockets.Tests
+namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public class WebSocketConnectionSummary
     {
diff --git a/test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionTests.ConnectionLifecycle.cs b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.ConnectionLifecycle.cs
similarity index 96%
rename from test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionTests.ConnectionLifecycle.cs
rename to test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.ConnectionLifecycle.cs
index 7a8b24ce2e..2b76655fb4 100644
--- a/test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionTests.ConnectionLifecycle.cs
+++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.ConnectionLifecycle.cs
@@ -3,11 +3,9 @@ using System.Diagnostics;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Channels;
-using Microsoft.Extensions.WebSockets.Test;
 using Xunit;
 
-namespace Microsoft.Extensions.WebSockets.Tests
+namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public partial class WebSocketConnectionTests
     {
@@ -50,7 +48,7 @@ namespace Microsoft.Extensions.WebSockets.Tests
         [Fact]
         public async Task ExecuteReturnsWhenCloseFrameReceived()
         {
-            using(var pair = WebSocketPair.Create())
+            using (var pair = WebSocketPair.Create())
             {
                 var client = pair.ClientSocket.ExecuteAndCaptureFramesAsync();
                 await pair.ClientSocket.CloseAsync(new WebSocketCloseResult(WebSocketCloseStatus.InvalidMessageType, "Abc"));
@@ -71,7 +69,7 @@ namespace Microsoft.Extensions.WebSockets.Tests
         [Fact]
         public async Task AbnormalTerminationOfInboundChannelCausesExecuteToThrow()
         {
-            using(var pair = WebSocketPair.Create())
+            using (var pair = WebSocketPair.Create())
             {
                 var client = pair.ClientSocket.ExecuteAndCaptureFramesAsync();
                 var server = pair.ServerSocket.ExecuteAndCaptureFramesAsync();
diff --git a/test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionTests.ReceiveAsync.cs b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.ReceiveAsync.cs
similarity index 99%
rename from test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionTests.ReceiveAsync.cs
rename to test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.ReceiveAsync.cs
index 6eac3e1481..cb9fa5f599 100644
--- a/test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionTests.ReceiveAsync.cs
+++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.ReceiveAsync.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
 using System.Threading;
@@ -7,7 +6,7 @@ using System.Threading.Tasks;
 using Channels;
 using Xunit;
 
-namespace Microsoft.Extensions.WebSockets.Tests
+namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public partial class WebSocketConnectionTests
     {
diff --git a/test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionTests.SendAsync.cs b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.SendAsync.cs
similarity index 99%
rename from test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionTests.SendAsync.cs
rename to test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.SendAsync.cs
index cfdfe4d560..0d5723de69 100644
--- a/test/Microsoft.Extensions.WebSockets.Tests/WebSocketConnectionTests.SendAsync.cs
+++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.SendAsync.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Channels;
 using Xunit;
 
-namespace Microsoft.Extensions.WebSockets.Tests
+namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public partial class WebSocketConnectionTests
     {
diff --git a/test/Microsoft.Extensions.WebSockets.Tests/Internal/WebSocketPair.cs b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketPair.cs
similarity index 96%
rename from test/Microsoft.Extensions.WebSockets.Tests/Internal/WebSocketPair.cs
rename to test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketPair.cs
index 8c5ef2d8b5..1c22596f38 100644
--- a/test/Microsoft.Extensions.WebSockets.Tests/Internal/WebSocketPair.cs
+++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketPair.cs
@@ -1,7 +1,7 @@
 using System;
 using Channels;
 
-namespace Microsoft.Extensions.WebSockets.Test
+namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     internal class WebSocketPair : IDisposable
     {
diff --git a/test/Microsoft.Extensions.WebSockets.Tests/project.json b/test/Microsoft.Extensions.WebSockets.Internal.Tests/project.json
similarity index 90%
rename from test/Microsoft.Extensions.WebSockets.Tests/project.json
rename to test/Microsoft.Extensions.WebSockets.Internal.Tests/project.json
index 008c6d1ab9..1b8f37723f 100644
--- a/test/Microsoft.Extensions.WebSockets.Tests/project.json
+++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/project.json
@@ -4,7 +4,7 @@
   },
   "dependencies": {
     "dotnet-test-xunit": "1.0.0-rc3-000000-01",
-    "Microsoft.Extensions.WebSockets": "0.1.0-*",
+    "Microsoft.Extensions.WebSockets.Internal": "0.1.0-*",
     "xunit": "2.1.0"
   },
   "testRunner": "xunit",