diff --git a/src/Microsoft.AspNetCore.Sockets.Client/LongPollingTransport.cs b/src/Microsoft.AspNetCore.Sockets.Client/LongPollingTransport.cs
index 5fe7d57cfd..c861c58a34 100644
--- a/src/Microsoft.AspNetCore.Sockets.Client/LongPollingTransport.cs
+++ b/src/Microsoft.AspNetCore.Sockets.Client/LongPollingTransport.cs
@@ -30,6 +30,10 @@ namespace Microsoft.AspNetCore.Sockets.Client
 
         public Task Running { get; private set; }
 
+        public LongPollingTransport(HttpClient httpClient) 
+            : this(httpClient, null)
+        { }
+
         public LongPollingTransport(HttpClient httpClient, ILoggerFactory loggerFactory)
         {
             _httpClient = httpClient;
diff --git a/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs b/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
index 2641eb175e..f34ffc47d7 100644
--- a/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
+++ b/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
@@ -152,6 +152,8 @@ namespace Microsoft.AspNetCore.Sockets.Client
                 uriBuilder.Scheme = "wss";
             }
 
+            uriBuilder.Path += "/ws";
+
             await _webSocket.ConnectAsync(uriBuilder.Uri, _cancellationToken);
         }
 
diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
index c04be32603..08bb88a562 100644
--- a/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
+++ b/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
@@ -54,8 +54,19 @@ namespace Microsoft.AspNetCore.SignalR.Tests
             }
         }
 
-        [Fact]
-        public async Task ConnectionCanSendAndReceiveMessages()
+        public static IEnumerable<object[]> Transports
+        {
+            get
+            {
+                yield return new object[] { new WebSocketsTransport() };
+                yield return new object[] { new LongPollingTransport(new HttpClient()) };
+            }
+        }
+
+        [ConditionalTheory]
+        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2, SkipReason = "No WebSockets Client for this platform")]
+        [MemberData(nameof(Transports))]
+        public async Task ConnectionCanSendAndReceiveMessages(ITransport transport)
         {
             const string message = "Major Key";
             var baseUrl = _serverFixture.BaseUrl;
@@ -63,7 +74,6 @@ namespace Microsoft.AspNetCore.SignalR.Tests
 
             using (var httpClient = new HttpClient())
             {
-                var transport = new LongPollingTransport(httpClient, loggerFactory);
                 var connection = new ClientConnection(new Uri(baseUrl + "/echo"), loggerFactory);
                 try
                 {
@@ -113,10 +123,10 @@ namespace Microsoft.AspNetCore.SignalR.Tests
             var baseUrl = _serverFixture.BaseUrl;
             var loggerFactory = new LoggerFactory();
 
-            var transport = new WebSocketsTransport();
-            var connection = new ClientConnection(new Uri(baseUrl + "/echo/ws"), loggerFactory);
+            var connection = new ClientConnection(new Uri(baseUrl + "/echo"), loggerFactory);
             try
             {
+                var transport = new WebSocketsTransport();
                 var receiveTcs = new TaskCompletionSource<byte[]>();
                 connection.Received += (data, messageType) => receiveTcs.SetResult(data);