diff --git a/samples/StaticFileSample/Startup.cs b/samples/StaticFileSample/Startup.cs
index e06bbaccfe..3e8f7c3a66 100644
--- a/samples/StaticFileSample/Startup.cs
+++ b/samples/StaticFileSample/Startup.cs
@@ -25,13 +25,13 @@ namespace StaticFilesSample
 
         public static void Main(string[] args)
         {
-            var application = new WebApplicationBuilder()
-                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+            var host = new WebHostBuilder()
+                .UseDefaultConfiguration(args)
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
 
-            application.Run();
+            host.Run();
         }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs
index f52aff1078..b85ad11fa9 100644
--- a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNet.StaticFiles
         [Fact]
         public async Task ReturnsNotFoundWithoutWwwroot()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app => app.UseStaticFiles());
             var server = new TestServer(builder);
 
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFilesTestServer.cs b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFilesTestServer.cs
index cb35f5be4c..927b95d6ff 100644
--- a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFilesTestServer.cs
+++ b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFilesTestServer.cs
@@ -15,13 +15,14 @@ namespace Microsoft.AspNet.StaticFiles
     {
         public static TestServer Create(Action<IApplicationBuilder> configureApp, Action<IServiceCollection> configureServices = null)
         {
-            var configurationBuilder = new ConfigurationBuilder();
-            configurationBuilder.AddInMemoryCollection(new []
-            {
-                new KeyValuePair<string, string>("webroot", ".")
-            });
-            var builder = new WebApplicationBuilder()
-                .UseConfiguration(configurationBuilder.Build())
+            var configuration = new ConfigurationBuilder()
+                .AddInMemoryCollection(new []
+                {
+                    new KeyValuePair<string, string>("webroot", ".")
+                })
+                .Build();
+            var builder = new WebHostBuilder()
+                .UseConfiguration(configuration)
                 .Configure(configureApp)
                 .ConfigureServices(configureServices);
             return new TestServer(builder);