diff --git a/.gitignore b/.gitignore
index c1d75776c9..2837d3092b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ nuget.exe
 *.ipch
 *.sln.ide
 project.lock.json
+/.vs/
diff --git a/test/AutobahnTestServer/Startup.cs b/test/AutobahnTestServer/Startup.cs
index f0168a767e..5af6589de0 100644
--- a/test/AutobahnTestServer/Startup.cs
+++ b/test/AutobahnTestServer/Startup.cs
@@ -72,12 +72,12 @@ namespace AutobahnTestServer
 
         public static void Main(string[] args)
         {
-            var application = new WebApplicationBuilder()
-                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+            var host = new WebHostBuilder()
+                .UseDefaultConfiguration(args)
                 .UseStartup<Startup>()
                 .Build();
 
-            application.Run();
+            host.Run();
         }
     }
 }
diff --git a/test/Microsoft.AspNet.WebSockets.Client.Test/KestrelWebSocketHelpers.cs b/test/Microsoft.AspNet.WebSockets.Client.Test/KestrelWebSocketHelpers.cs
index 132da53e5b..9f2a9b321e 100644
--- a/test/Microsoft.AspNet.WebSockets.Client.Test/KestrelWebSocketHelpers.cs
+++ b/test/Microsoft.AspNet.WebSockets.Client.Test/KestrelWebSocketHelpers.cs
@@ -45,15 +45,15 @@ namespace Microsoft.AspNet.WebSockets.Client.Test
             var config = configBuilder.Build();
             config["server.urls"] = "http://localhost:54321";
 
-            var application = new WebApplicationBuilder()
+            var host = new WebHostBuilder()
                 .UseConfiguration(config)
                 .UseServer("Microsoft.AspNet.Server.Kestrel")
                 .Configure(startup)
                 .Build();
 
-            application.Start();
+            host.Start();
 
-            return application;
+            return host;
         }
     }
 }