diff --git a/test/AutobahnTestApp/Startup.cs b/test/AutobahnTestApp/Startup.cs
index 97ac3d09f7..a7005b2247 100644
--- a/test/AutobahnTestApp/Startup.cs
+++ b/test/AutobahnTestApp/Startup.cs
@@ -15,15 +15,6 @@ namespace AutobahnTestApp
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
-            if (!env.IsEnvironment("NativeSockets"))
-            {
-                // Register a middleware that disables the server-provided WebSockets feature
-                app.Use((context, next) =>
-                {
-                    context.Features.Set<IHttpWebSocketFeature>(null);
-                    return next();
-                });
-            }
             app.UseWebSockets();
 
             app.Use(async (context, next) =>
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs
index 6f33cf5e27..28a111d5c2 100644
--- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs
@@ -75,9 +75,6 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest
                     }
                 }
 
-                // REQUIRES a build of WebListener that supports native WebSockets, which we don't have right now
-                //await tester.DeployTestAndAddToSpec(ServerType.WebListener, ssl: false, environment: "NativeSockets");
-
                 result = await tester.Run(cts.Token);
                 tester.Verify(result);
             }