diff --git a/samples/IdentitySample.Mvc/Startup.cs b/samples/IdentitySample.Mvc/Startup.cs
index 6c1ada9b3e..d5fbf3fea3 100644
--- a/samples/IdentitySample.Mvc/Startup.cs
+++ b/samples/IdentitySample.Mvc/Startup.cs
@@ -121,14 +121,12 @@ namespace IdentitySample
         // Entry point for the application.
         public static void Main(string[] args)
         {
-            var config = WebApplicationConfiguration.GetDefault(args);
-
-            var application = new WebApplicationBuilder()
-                .UseConfiguration(config)
+            var host = new WebHostBuilder()
+                .UseDefaultConfiguration(args)
                 .UseStartup<Startup>()
                 .Build();
 
-            application.Run();
+            host.Run();
         }
     }
 }
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/FunctionalTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/FunctionalTest.cs
index 0ffcd2f035..dbcb1f185b 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/FunctionalTest.cs
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/FunctionalTest.cs
@@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Identity.InMemory
         [Fact]
         public void UseIdentityThrowsWithoutAddIdentity()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app => app.UseIdentity());
             Assert.Throws<InvalidOperationException>(() => new TestServer(builder));
         }
@@ -182,7 +182,7 @@ namespace Microsoft.AspNet.Identity.InMemory
 
         private static TestServer CreateServer(Action<IServiceCollection> configureServices = null, Func<HttpContext, Task> testpath = null, Uri baseAddress = null)
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseIdentity();