diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs
index f93f88915d..f56eb2b096 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs
@@ -312,10 +312,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
                 }
             }
 
-            await ProduceStartAndFireOnStarting();
-
-            // Force flush
-            await SocketOutput.WriteAsync(_emptyData);
+            await FlushAsync(CancellationToken.None);
 
             return DuplexStream;
         }
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs
index efd3669104..705045ef05 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs
@@ -5,7 +5,7 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Server.Kestrel.Infrastructure;
+using Microsoft.AspNetCore.Server.Kestrel.Infrastructure;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Http
 {
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs
index 606c112d36..f229e39305 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs
@@ -5,7 +5,7 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Server.Kestrel.Infrastructure;
+using Microsoft.AspNetCore.Server.Kestrel.Infrastructure;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Http
 {
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs
index 127a79477d..824ab4378b 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs
@@ -155,7 +155,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                 var halfWriteBehindBuffer = new ArraySegment<byte>(data, 0, bufferSize);
 
                 // Act 
-                var writeTask1 = socketOutput.WriteAsync(halfWriteBehindBuffer);
+                var writeTask1 = socketOutput.WriteAsync(halfWriteBehindBuffer, CancellationToken.None);
                 // Assert
                 // The first write should pre-complete since it is <= _maxBytesPreCompleted.
                 Assert.Equal(TaskStatus.RanToCompletion, writeTask1.Status);
@@ -168,7 +168,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                 socketOutput.ProducingComplete(iter);
 
                 // Act
-                var writeTask2 = socketOutput.WriteAsync(halfWriteBehindBuffer);
+                var writeTask2 = socketOutput.WriteAsync(halfWriteBehindBuffer, CancellationToken.None);
                 // Assert 
                 // Too many bytes are already pre-completed for the fourth write to pre-complete.
                 Assert.True(writeRequestedWh.Wait(1000));
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestHelpers/MockConnection.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockConnection.cs
similarity index 72%
rename from test/Microsoft.AspNet.Server.KestrelTests/TestHelpers/MockConnection.cs
rename to test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockConnection.cs
index 20a937213d..74181488c2 100644
--- a/test/Microsoft.AspNet.Server.KestrelTests/TestHelpers/MockConnection.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockConnection.cs
@@ -1,8 +1,9 @@
+using System;
 using System.Threading;
-using Microsoft.AspNet.Server.Kestrel.Http;
-using Microsoft.AspNet.Server.Kestrel.Networking;
+using Microsoft.AspNetCore.Server.Kestrel.Networking;
+using Microsoft.AspNetCore.Server.Kestrel.Http;
 
-namespace Microsoft.AspNet.Server.KestrelTests.TestHelpers
+namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers
 {
     public class MockConnection : Connection
     {