diff --git a/samples/ClaimsTransformation/Program.cs b/samples/ClaimsTransformation/Program.cs
index 91cd418a05..2e80b15315 100644
--- a/samples/ClaimsTransformation/Program.cs
+++ b/samples/ClaimsTransformation/Program.cs
@@ -14,12 +14,13 @@ namespace AuthSamples.ClaimsTransformer
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateWebHostBuilder(args)
+                .Build()
+                .Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+                .UseStartup<Startup>();
     }
 }
diff --git a/samples/Cookies/Program.cs b/samples/Cookies/Program.cs
index 2bb34d98ce..bea350e31d 100644
--- a/samples/Cookies/Program.cs
+++ b/samples/Cookies/Program.cs
@@ -14,12 +14,13 @@ namespace AuthSamples.Cookies
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateWebHostBuilder(args)
+                .Build()
+                .Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+                .UseStartup<Startup>();
     }
 }
diff --git a/samples/DynamicSchemes/Program.cs b/samples/DynamicSchemes/Program.cs
index ecb4c00774..1cc18672af 100644
--- a/samples/DynamicSchemes/Program.cs
+++ b/samples/DynamicSchemes/Program.cs
@@ -14,12 +14,13 @@ namespace AuthSamples.DynamicSchemes
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateWebHostBuilder(args)
+                .Build()
+                .Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+                .UseStartup<Startup>();
     }
 }
diff --git a/samples/Identity.ExternalClaims/Program.cs b/samples/Identity.ExternalClaims/Program.cs
index 37a3281287..d65f6c66c3 100644
--- a/samples/Identity.ExternalClaims/Program.cs
+++ b/samples/Identity.ExternalClaims/Program.cs
@@ -14,12 +14,11 @@ namespace Identity.ExternalClaims
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateWebHostBuilder(args).Build().Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+                .UseStartup<Startup>();
     }
 }
diff --git a/samples/PathSchemeSelection/Program.cs b/samples/PathSchemeSelection/Program.cs
index 424cb8c9bc..c5d428cc02 100644
--- a/samples/PathSchemeSelection/Program.cs
+++ b/samples/PathSchemeSelection/Program.cs
@@ -14,12 +14,11 @@ namespace AuthSamples.PathSchemeSelection
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateWebHostBuilder(args).Build().Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+                .UseStartup<Startup>();
     }
 }
diff --git a/test/AuthSamples.FunctionalTests/ClaimsTransformTests.cs b/test/AuthSamples.FunctionalTests/ClaimsTransformTests.cs
index 003360bdb2..d402a2b56d 100644
--- a/test/AuthSamples.FunctionalTests/ClaimsTransformTests.cs
+++ b/test/AuthSamples.FunctionalTests/ClaimsTransformTests.cs
@@ -4,15 +4,16 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Xunit;
 
 namespace AuthSamples.FunctionalTests
 {
-    public class ClaimsTransformTests : IClassFixture<SampleTestFixture<ClaimsTransformer.Startup>>
+    public class ClaimsTransformTests : IClassFixture<WebApplicationFactory<ClaimsTransformer.Startup>>
     {
-        public ClaimsTransformTests(SampleTestFixture<ClaimsTransformer.Startup> fixture)
+        public ClaimsTransformTests(WebApplicationFactory<ClaimsTransformer.Startup> fixture)
         {
-            Client = fixture.Client;
+            Client = fixture.CreateDefaultClient();
         }
 
         public HttpClient Client { get; }
diff --git a/test/AuthSamples.FunctionalTests/CookiesTests.cs b/test/AuthSamples.FunctionalTests/CookiesTests.cs
index 13cf85a035..c8e9dd93a6 100644
--- a/test/AuthSamples.FunctionalTests/CookiesTests.cs
+++ b/test/AuthSamples.FunctionalTests/CookiesTests.cs
@@ -4,15 +4,16 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Xunit;
 
 namespace AuthSamples.FunctionalTests
 {
-    public class CookiesTests : IClassFixture<SampleTestFixture<Cookies.Startup>>
+    public class CookiesTests : IClassFixture<WebApplicationFactory<Cookies.Startup>>
     {
-        public CookiesTests(SampleTestFixture<Cookies.Startup> fixture)
+        public CookiesTests(WebApplicationFactory<Cookies.Startup> fixture)
         {
-            Client = fixture.Client;
+            Client = fixture.CreateDefaultClient();
         }
 
         public HttpClient Client { get; }
diff --git a/test/AuthSamples.FunctionalTests/DynamicSchemeTests.cs b/test/AuthSamples.FunctionalTests/DynamicSchemeTests.cs
index c892534126..6b36267df5 100644
--- a/test/AuthSamples.FunctionalTests/DynamicSchemeTests.cs
+++ b/test/AuthSamples.FunctionalTests/DynamicSchemeTests.cs
@@ -4,15 +4,16 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Xunit;
 
 namespace AuthSamples.FunctionalTests
 {
-    public class DynamicSchemeTests : IClassFixture<SampleTestFixture<DynamicSchemes.Startup>>
+    public class DynamicSchemeTests : IClassFixture<WebApplicationFactory<DynamicSchemes.Startup>>
     {
-        public DynamicSchemeTests(SampleTestFixture<DynamicSchemes.Startup> fixture)
+        public DynamicSchemeTests(WebApplicationFactory<DynamicSchemes.Startup> fixture)
         {
-            Client = fixture.Client;
+            Client = fixture.CreateDefaultClient();
         }
 
         public HttpClient Client { get; }
diff --git a/test/AuthSamples.FunctionalTests/IdentityExternalClaimsTests.cs b/test/AuthSamples.FunctionalTests/IdentityExternalClaimsTests.cs
index ba99876a55..e91874ac06 100644
--- a/test/AuthSamples.FunctionalTests/IdentityExternalClaimsTests.cs
+++ b/test/AuthSamples.FunctionalTests/IdentityExternalClaimsTests.cs
@@ -4,15 +4,16 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Xunit;
 
 namespace AuthSamples.FunctionalTests
 {
-    public class IdentityExternalClaimsTests : IClassFixture<SampleTestFixture<Identity.ExternalClaims.Startup>>
+    public class IdentityExternalClaimsTests : IClassFixture<WebApplicationFactory<Identity.ExternalClaims.Startup>>
     {
-        public IdentityExternalClaimsTests(SampleTestFixture<Identity.ExternalClaims.Startup> fixture)
+        public IdentityExternalClaimsTests(WebApplicationFactory<Identity.ExternalClaims.Startup> fixture)
         {
-            Client = fixture.Client;
+            Client = fixture.CreateDefaultClient();
         }
 
         public HttpClient Client { get; }
diff --git a/test/AuthSamples.FunctionalTests/PathSchemeSelectionTests.cs b/test/AuthSamples.FunctionalTests/PathSchemeSelectionTests.cs
index 7a9f64f5b8..9a3246575e 100644
--- a/test/AuthSamples.FunctionalTests/PathSchemeSelectionTests.cs
+++ b/test/AuthSamples.FunctionalTests/PathSchemeSelectionTests.cs
@@ -4,15 +4,16 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Xunit;
 
 namespace AuthSamples.FunctionalTests
 {
-    public class PathSchemeSelectionTests : IClassFixture<SampleTestFixture<PathSchemeSelection.Startup>>
+    public class PathSchemeSelectionTests : IClassFixture<WebApplicationFactory<PathSchemeSelection.Startup>>
     {
-        public PathSchemeSelectionTests(SampleTestFixture<PathSchemeSelection.Startup> fixture)
+        public PathSchemeSelectionTests(WebApplicationFactory<PathSchemeSelection.Startup> fixture)
         {
-            Client = fixture.Client;
+            Client = fixture.CreateDefaultClient();
         }
 
         public HttpClient Client { get; }
diff --git a/test/AuthSamples.FunctionalTests/SampleTestFixture.cs b/test/AuthSamples.FunctionalTests/SampleTestFixture.cs
deleted file mode 100644
index 365c976e78..0000000000
--- a/test/AuthSamples.FunctionalTests/SampleTestFixture.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.IO;
-using Microsoft.AspNetCore.Mvc.Testing;
-
-namespace AuthSamples.FunctionalTests
-{
-    public class SampleTestFixture<TStartup> : WebApplicationTestFixture<TStartup> where TStartup : class
-    {
-        public SampleTestFixture() : base(Path.Combine("samples", typeof(TStartup).Assembly.GetName().Name)) { }
-    }
-}
diff --git a/test/AuthSamples.FunctionalTests/xunit.runner.json b/test/AuthSamples.FunctionalTests/xunit.runner.json
new file mode 100644
index 0000000000..42db7ef95e
--- /dev/null
+++ b/test/AuthSamples.FunctionalTests/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}