diff --git a/src/Microsoft.AspNetCore.WebSockets/Microsoft.AspNetCore.WebSockets.csproj b/src/Microsoft.AspNetCore.WebSockets/Microsoft.AspNetCore.WebSockets.csproj
index 5a852d8c73..eed3aa747b 100644
--- a/src/Microsoft.AspNetCore.WebSockets/Microsoft.AspNetCore.WebSockets.csproj
+++ b/src/Microsoft.AspNetCore.WebSockets/Microsoft.AspNetCore.WebSockets.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core web socket middleware for use on top of opaque servers.</Description>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/BufferStream.cs b/test/Microsoft.AspNetCore.WebSockets.Test/BufferStream.cs
index 9b9a82f250..bba60a658b 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Test/BufferStream.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.Test/BufferStream.cs
@@ -152,73 +152,6 @@ namespace Microsoft.AspNetCore.WebSockets.Test
             }
         }
 
-#if !NETCOREAPP1_1
-        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
-        {
-            // TODO: This option doesn't preserve the state object.
-            // return ReadAsync(buffer, offset, count);
-            return base.BeginRead(buffer, offset, count, callback, state);
-        }
-
-        public override int EndRead(IAsyncResult asyncResult)
-        {
-            // return ((Task<int>)asyncResult).Result;
-            return base.EndRead(asyncResult);
-        }
-
-        public async override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-        {
-            if(_terminated)
-            {
-                return 0;
-            }
-
-            VerifyBuffer(buffer, offset, count, allowEmpty: false);
-            CancellationTokenRegistration registration = cancellationToken.Register(Abort);
-            await _readLock.WaitAsync(cancellationToken);
-            try
-            {
-                int totalRead = 0;
-                do
-                {
-                    // Don't drained buffered data on abort.
-                    CheckAborted();
-                    if (_topBuffer.Count <= 0)
-                    {
-                        byte[] topBuffer = null;
-                        while (!_bufferedData.TryDequeue(out topBuffer))
-                        {
-                            if (_disposed)
-                            {
-                                CheckAborted();
-                                // Graceful close
-                                return totalRead;
-                            }
-                            await WaitForDataAsync();
-                        }
-                        _topBuffer = new ArraySegment<byte>(topBuffer);
-                    }
-                    int actualCount = Math.Min(count, _topBuffer.Count);
-                    Buffer.BlockCopy(_topBuffer.Array, _topBuffer.Offset, buffer, offset, actualCount);
-                    _topBuffer = new ArraySegment<byte>(_topBuffer.Array,
-                        _topBuffer.Offset + actualCount,
-                        _topBuffer.Count - actualCount);
-                    totalRead += actualCount;
-                    offset += actualCount;
-                    count -= actualCount;
-                }
-                while (count > 0 && (_topBuffer.Count > 0 || _bufferedData.Count > 0));
-                // Keep reading while there is more data available and we have more space to put it in.
-                return totalRead;
-            }
-            finally
-            {
-                registration.Dispose();
-                _readLock.Release();
-            }
-        }
-#endif
-
         // Write with count 0 will still trigger OnFirstWrite
         public override void Write(byte[] buffer, int offset, int count)
         {
@@ -245,39 +178,6 @@ namespace Microsoft.AspNetCore.WebSockets.Test
             }
         }
 
-#if !NETCOREAPP1_1
-        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
-        {
-            Write(buffer, offset, count);
-            TaskCompletionSource<object> tcs = new TaskCompletionSource<object>(state);
-            tcs.TrySetResult(null);
-            IAsyncResult result = tcs.Task;
-            if (callback != null)
-            {
-                callback(result);
-            }
-            return result;
-        }
-
-        public override void EndWrite(IAsyncResult asyncResult)
-        {
-        }
-
-        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-        {
-            VerifyBuffer(buffer, offset, count, allowEmpty: true);
-            if (cancellationToken.IsCancellationRequested)
-            {
-                TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
-                tcs.TrySetCanceled();
-                return tcs.Task;
-            }
-
-            Write(buffer, offset, count);
-            return Task.FromResult<object>(null);
-        }
-#endif
-
         private static void VerifyBuffer(byte[] buffer, int offset, int count, bool allowEmpty)
         {
             if (offset < 0 || offset > buffer.Length)
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/DuplexStream.cs b/test/Microsoft.AspNetCore.WebSockets.Test/DuplexStream.cs
index 11f65759cc..f2421bf4e6 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Test/DuplexStream.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.Test/DuplexStream.cs
@@ -94,33 +94,6 @@ namespace Microsoft.AspNetCore.WebSockets.Test
             return ReadStream.Read(buffer, offset, count);
         }
 
-#if !NETCOREAPP1_1
-        public override int ReadByte()
-        {
-            return ReadStream.ReadByte();
-        }
-
-        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
-        {
-            return ReadStream.BeginRead(buffer, offset, count, callback, state);
-        }
-
-        public override int EndRead(IAsyncResult asyncResult)
-        {
-            return ReadStream.EndRead(asyncResult);
-        }
-
-        public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-        {
-            return ReadStream.ReadAsync(buffer, offset, count, cancellationToken);
-        }
-
-        public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
-        {
-            return ReadStream.CopyToAsync(destination, bufferSize, cancellationToken);
-        }
-#endif
-
 #endregion Read
 
 #region Write
@@ -130,33 +103,6 @@ namespace Microsoft.AspNetCore.WebSockets.Test
             WriteStream.Write(buffer, offset, count);
         }
 
-#if !NETCOREAPP1_1
-        public override void WriteByte(byte value)
-        {
-            WriteStream.WriteByte(value);
-        }
-
-        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
-        {
-            return WriteStream.BeginWrite(buffer, offset, count, callback, state);
-        }
-
-        public override void EndWrite(IAsyncResult asyncResult)
-        {
-            WriteStream.EndWrite(asyncResult);
-        }
-
-        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-        {
-            return WriteStream.WriteAsync(buffer, offset, count, cancellationToken);
-        }
-
-        public override Task FlushAsync(CancellationToken cancellationToken)
-        {
-            return WriteStream.FlushAsync(cancellationToken);
-        }
-#endif
-
         public override void Flush()
         {
             WriteStream.Flush();
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj b/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj
index 60e7a8d6f3..56b131f821 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj
+++ b/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj
@@ -3,8 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <PlatformTarget Condition="'$(TargetFramework)' == 'net46'">x64</PlatformTarget>
 
     <!--