diff --git a/Microsoft.AspNet.SignalR.sln b/Microsoft.AspNet.SignalR.sln
index 3812428076..1e193ba5fb 100644
--- a/Microsoft.AspNet.SignalR.sln
+++ b/Microsoft.AspNet.SignalR.sln
@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1E4BA77C
 		build\Microsoft.AspNet.SignalR.OpenCover.xunit = build\Microsoft.AspNet.SignalR.OpenCover.xunit
 		src\Common\Microsoft.AspNet.SignalR.ruleset = src\Common\Microsoft.AspNet.SignalR.ruleset
 		src\Common\Microsoft.AspNet.SignalR.targets = src\Common\Microsoft.AspNet.SignalR.targets
+		build\Microsoft.AspNet.SignalR.UnitTests.OpenCover.xunit = build\Microsoft.AspNet.SignalR.UnitTests.OpenCover.xunit
 		Build\Microsoft.AspNet.SignalR.versions.targets = Build\Microsoft.AspNet.SignalR.versions.targets
 		ReleaseNotes.md = ReleaseNotes.md
 	EndProjectSection
@@ -92,7 +93,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Cl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Tests", "tests\Microsoft.AspNet.SignalR.Tests\Microsoft.AspNet.SignalR.Tests.csproj", "{FBA09237-84CC-4383-BD12-CDF58E4020E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Client.CSharp.Tests", "tests\Microsoft.AspNet.SignalR.Client.CSharp.Tests\Microsoft.AspNet.SignalR.Client.CSharp.Tests.csproj", "{8B9D292A-0F2D-444D-9A61-2D96A0E7041E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Client.Tests", "tests\Microsoft.AspNet.SignalR.Client.Tests\Microsoft.AspNet.SignalR.Client.Tests.csproj", "{8B9D292A-0F2D-444D-9A61-2D96A0E7041E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/build/Build.proj b/build/Build.proj
index 8fab882361..d21defe73a 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -162,7 +162,7 @@
 
   <ItemGroup>
     <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Tests\Microsoft.AspNet.SignalR.Tests.csproj"></UnitTestProjects>
-    <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.CSharp.Tests\Microsoft.AspNet.SignalR.Client.CSharp.Tests.csproj"></UnitTestProjects>
+    <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.Tests\Microsoft.AspNet.SignalR.Client.Tests.csproj"></UnitTestProjects>
     <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.SqlServer.Tests\Microsoft.AspNet.SignalR.SqlServer.Tests.csproj"></UnitTestProjects>
   </ItemGroup>
 
@@ -259,8 +259,8 @@
            Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Tests.XunitResults.xml"
            Verbose="true" />
 
-    <xunit Assembly="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Client.CSharp.Tests\Microsoft.AspNet.SignalR.Client.CSharp.Tests.dll"
-       Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Client.CSharp.Tests.XunitResults.xml"
+    <xunit Assembly="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Client.Tests\Microsoft.AspNet.SignalR.Client.Tests.dll"
+       Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Client.Tests.XunitResults.xml"
        Verbose="true" />
     
     <xunit Assembly="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.SqlServer.Tests\Microsoft.AspNet.SignalR.SqlServer.Tests.dll"
diff --git a/build/Microsoft.AspNet.SignalR.OpenCover.targets b/build/Microsoft.AspNet.SignalR.OpenCover.targets
index 0fcdcfad33..84ce2196e1 100644
--- a/build/Microsoft.AspNet.SignalR.OpenCover.targets
+++ b/build/Microsoft.AspNet.SignalR.OpenCover.targets
@@ -18,7 +18,7 @@
                MergeByHash="True"
                Filter="+[Microsoft.AspNet.SignalR*]*
                        -[Microsoft.AspNet.SignalR.Tests*]*
-                       -[Microsoft.AspNet.SignalR.CSharp.Tests*]*
+                       -[Microsoft.AspNet.SignalR.Client.Tests*]*
                        -[Microsoft.AspNet.SignalR.FunctionalTests*]*
                        -[Microsoft.AspNet.SignalR.Hosting.Memory*]*
                        -[Microsoft.AspNet.SignalR.TaskAsyncHelper]*"
diff --git a/build/Microsoft.AspNet.SignalR.OpenCover.xunit b/build/Microsoft.AspNet.SignalR.OpenCover.xunit
index 1b99cd2aa1..16739027fc 100644
--- a/build/Microsoft.AspNet.SignalR.OpenCover.xunit
+++ b/build/Microsoft.AspNet.SignalR.OpenCover.xunit
@@ -3,7 +3,7 @@
   <assemblies>
     <!-- NOTE: OpenCover requires shadow-copy to be false -->
     <assembly filename="Microsoft.AspNet.SignalR.Tests\Microsoft.AspNet.SignalR.Tests.dll" shadow-copy="false" />
-    <assembly filename="Microsoft.AspNet.SignalR.Client.CSharp.Tests\Microsoft.AspNet.SignalR.Client.CSharp.Tests.dll" shadow-copy="false" />
+    <assembly filename="Microsoft.AspNet.SignalR.Client.Tests\Microsoft.AspNet.SignalR.Client.Tests.dll" shadow-copy="false" />
     <assembly filename="Microsoft.AspNet.SignalR.FunctionalTests\bin\Microsoft.AspNet.SignalR.FunctionalTests.dll" shadow-copy="false" />
   </assemblies>
 </xunit>
\ No newline at end of file
diff --git a/build/Microsoft.AspNet.SignalR.UnitTests.OpenCover.xunit b/build/Microsoft.AspNet.SignalR.UnitTests.OpenCover.xunit
index 5fb2daa26e..55ca56c3f5 100644
--- a/build/Microsoft.AspNet.SignalR.UnitTests.OpenCover.xunit
+++ b/build/Microsoft.AspNet.SignalR.UnitTests.OpenCover.xunit
@@ -3,6 +3,6 @@
   <assemblies>
     <!-- NOTE: OpenCover requires shadow-copy to be false -->
     <assembly filename="Microsoft.AspNet.SignalR.Tests\Microsoft.AspNet.SignalR.Tests.dll" shadow-copy="false" />
-    <assembly filename="Microsoft.AspNet.SignalR.Client.CSharp.Tests\Microsoft.AspNet.SignalR.Client.CSharp.Tests.dll" shadow-copy="false" />
+    <assembly filename="Microsoft.AspNet.SignalR.Client.Tests\Microsoft.AspNet.SignalR.Client.Tests.dll" shadow-copy="false" />
   </assemblies>
 </xunit>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.SignalR.Client45/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.SignalR.Client45/Properties/AssemblyInfo.cs
index bcf8a48d08..da5055b1a9 100644
--- a/src/Microsoft.AspNet.SignalR.Client45/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNet.SignalR.Client45/Properties/AssemblyInfo.cs
@@ -6,5 +6,5 @@
 [assembly: AssemblyTitle("Microsoft.AspNet.SignalR.Client45")]
 [assembly: AssemblyDescription(".NET client for SignalR")]
 
-[assembly: InternalsVisibleTo("Microsoft.AspNet.SignalR.Client.CSharp.Tests")]
+[assembly: InternalsVisibleTo("Microsoft.AspNet.SignalR.Client.Tests")]
 
diff --git a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/ChunkBufferFacts.cs b/tests/Microsoft.AspNet.SignalR.Client.Tests/ChunkBufferFacts.cs
similarity index 97%
rename from tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/ChunkBufferFacts.cs
rename to tests/Microsoft.AspNet.SignalR.Client.Tests/ChunkBufferFacts.cs
index 3dbf9e2156..38ce7e45f1 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/ChunkBufferFacts.cs
+++ b/tests/Microsoft.AspNet.SignalR.Client.Tests/ChunkBufferFacts.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNet.SignalR.Client.Transports.ServerSentEvents;
 using Xunit;
 
-namespace Microsoft.AspNet.SignalR.CSharp.Tests
+namespace Microsoft.AspNet.SignalR.Client.Tests
 {
     public class ChunkBufferFacts
     {
diff --git a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/ConnectionFacts.cs b/tests/Microsoft.AspNet.SignalR.Client.Tests/Client/ConnectionFacts.cs
similarity index 98%
rename from tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/ConnectionFacts.cs
rename to tests/Microsoft.AspNet.SignalR.Client.Tests/Client/ConnectionFacts.cs
index 041d6c61d3..efeb62c37a 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/ConnectionFacts.cs
+++ b/tests/Microsoft.AspNet.SignalR.Client.Tests/Client/ConnectionFacts.cs
@@ -13,21 +13,17 @@
 using Xunit;
 using Xunit.Extensions;
 
-namespace Microsoft.AspNet.SignalR.CSharp.Tests
+namespace Microsoft.AspNet.SignalR.Client.Tests
 {
     public class ConnectionFacts : IDisposable
     {
         [Theory]
-        [InlineData("?clientProtocol=","")]
+        [InlineData("?clientProtocol=", "")]
         [InlineData("&clientProtocol=", "foo=bar")]
         public void NegotiatePassesClientProtocolCorrectly(string clientProtocolParameter, string connectionQueryString)
         {
             var connection = new Client.Connection("http://test", connectionQueryString);
 
-            Console.BackgroundColor = ConsoleColor.DarkCyan;
-            Console.WriteLine("*********************************");
-            Console.ResetColor();
-
             try
             {
                 connection.Start(new LongPollingTransport(new UrlInspectingHttpClient((url) =>
@@ -35,7 +31,7 @@ public void NegotiatePassesClientProtocolCorrectly(string clientProtocolParamete
                     Assert.True(url.Contains(clientProtocolParameter + connection.Protocol.ToString()));
                 }))).Wait();
             }
-            catch 
+            catch
             {
                 // Swallow exceptions because the custom http client that we pass will throw unimplemented exceptions.
             }
diff --git a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/HubProxyFacts.cs b/tests/Microsoft.AspNet.SignalR.Client.Tests/Client/HubProxyFacts.cs
similarity index 98%
rename from tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/HubProxyFacts.cs
rename to tests/Microsoft.AspNet.SignalR.Client.Tests/Client/HubProxyFacts.cs
index c261dd0507..93a171f25b 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/HubProxyFacts.cs
+++ b/tests/Microsoft.AspNet.SignalR.Client.Tests/Client/HubProxyFacts.cs
@@ -8,7 +8,7 @@
 using Newtonsoft.Json.Linq;
 using Xunit;
 
-namespace Microsoft.AspNet.SignalR.CSharp.Tests
+namespace Microsoft.AspNet.SignalR.Client.Tests
 {
     public class HubProxyFacts
     {
diff --git a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/KeepAliveFacts.cs b/tests/Microsoft.AspNet.SignalR.Client.Tests/Client/KeepAliveFacts.cs
similarity index 98%
rename from tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/KeepAliveFacts.cs
rename to tests/Microsoft.AspNet.SignalR.Client.Tests/Client/KeepAliveFacts.cs
index ce332ce8f9..680ad98d9c 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/KeepAliveFacts.cs
+++ b/tests/Microsoft.AspNet.SignalR.Client.Tests/Client/KeepAliveFacts.cs
@@ -6,7 +6,7 @@
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.SignalR.CSharp.Tests
+namespace Microsoft.AspNet.SignalR.Client.Tests
 {
     public class KeepAliveFacts
     {
diff --git a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/TransportFacts.cs b/tests/Microsoft.AspNet.SignalR.Client.Tests/Client/TransportFacts.cs
similarity index 99%
rename from tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/TransportFacts.cs
rename to tests/Microsoft.AspNet.SignalR.Client.Tests/Client/TransportFacts.cs
index 79abb28d04..a72fcdf867 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Client/TransportFacts.cs
+++ b/tests/Microsoft.AspNet.SignalR.Client.Tests/Client/TransportFacts.cs
@@ -11,7 +11,7 @@
 using Xunit;
 using Xunit.Extensions;
 
-namespace Microsoft.AspNet.SignalR.CSharp.Tests
+namespace Microsoft.AspNet.SignalR.Client.Tests
 {
     public class TransportFacts
     {
diff --git a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/EventSourceStreamReaderFacts.cs b/tests/Microsoft.AspNet.SignalR.Client.Tests/EventSourceStreamReaderFacts.cs
similarity index 97%
rename from tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/EventSourceStreamReaderFacts.cs
rename to tests/Microsoft.AspNet.SignalR.Client.Tests/EventSourceStreamReaderFacts.cs
index 3c32c45916..2dbaba675a 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/EventSourceStreamReaderFacts.cs
+++ b/tests/Microsoft.AspNet.SignalR.Client.Tests/EventSourceStreamReaderFacts.cs
@@ -7,7 +7,7 @@
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.SignalR.CSharp.Tests
+namespace Microsoft.AspNet.SignalR.Client.Tests
 {
     public class EventSourceStreamReaderFacts : IDisposable
     {
diff --git a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests.csproj b/tests/Microsoft.AspNet.SignalR.Client.Tests/Microsoft.AspNet.SignalR.Client.Tests.csproj
similarity index 96%
rename from tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests.csproj
rename to tests/Microsoft.AspNet.SignalR.Client.Tests/Microsoft.AspNet.SignalR.Client.Tests.csproj
index a46b394b17..05172a83d9 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests.csproj
+++ b/tests/Microsoft.AspNet.SignalR.Client.Tests/Microsoft.AspNet.SignalR.Client.Tests.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{8B9D292A-0F2D-444D-9A61-2D96A0E7041E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.AspNet.SignalR.Client.CSharp.Tests</RootNamespace>
-    <AssemblyName>Microsoft.AspNet.SignalR.Client.CSharp.Tests</AssemblyName>
+    <RootNamespace>Microsoft.AspNet.SignalR.Client.Tests</RootNamespace>
+    <AssemblyName>Microsoft.AspNet.SignalR.Client.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
diff --git a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Properties/AssemblyInfo.cs b/tests/Microsoft.AspNet.SignalR.Client.Tests/Properties/AssemblyInfo.cs
similarity index 89%
rename from tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Properties/AssemblyInfo.cs
rename to tests/Microsoft.AspNet.SignalR.Client.Tests/Properties/AssemblyInfo.cs
index 40d9344e8d..7caecf79f6 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/Properties/AssemblyInfo.cs
+++ b/tests/Microsoft.AspNet.SignalR.Client.Tests/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Microsoft.AspNet.SignalR.Client.CSharp.Tests")]
+[assembly: AssemblyTitle("Microsoft.AspNet.SignalR.Client.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Microsoft.AspNet.SignalR.Client.CSharp.Tests")]
+[assembly: AssemblyProduct("Microsoft.AspNet.SignalR.Client.Tests")]
 [assembly: AssemblyCopyright("Copyright ©  2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/packages.config b/tests/Microsoft.AspNet.SignalR.Client.Tests/packages.config
similarity index 100%
rename from tests/Microsoft.AspNet.SignalR.Client.CSharp.Tests/packages.config
rename to tests/Microsoft.AspNet.SignalR.Client.Tests/packages.config