diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
index d04c5ff72a..e5bdbb478c 100644
--- a/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
@@ -56,7 +56,7 @@ namespace ContentNegotiationWebSite
             var optionsAccessor = ActionContext.HttpContext.RequestServices
                 .GetRequiredService<IOptions<MvcOptions>>();
             objectResult.Formatters.Add(new HttpNotAcceptableOutputFormatter());
-            foreach (var formatter in optionsAccessor.Options.OutputFormatters)
+            foreach (var formatter in optionsAccessor.Value.OutputFormatters)
             {
                 objectResult.Formatters.Add(formatter);
             }
@@ -74,7 +74,7 @@ namespace ContentNegotiationWebSite
                 objectResult.Formatters.Add(new HttpNotAcceptableOutputFormatter());
             }
 
-            foreach (var formatter in optionsAccessor.Options.OutputFormatters)
+            foreach (var formatter in optionsAccessor.Value.OutputFormatters)
             {
                 objectResult.Formatters.Add(formatter);
             }
diff --git a/test/WebSites/FiltersWebSite/AuthorizeBasicMiddleware.cs b/test/WebSites/FiltersWebSite/AuthorizeBasicMiddleware.cs
index 4aa2cd6cd0..b4cae02523 100644
--- a/test/WebSites/FiltersWebSite/AuthorizeBasicMiddleware.cs
+++ b/test/WebSites/FiltersWebSite/AuthorizeBasicMiddleware.cs
@@ -18,7 +18,7 @@ namespace FiltersWebSite
             IUrlEncoder encoder,
             string authScheme) : 
                 base(next, options, loggerFactory, encoder,
-                    new ConfigureOptions<BasicOptions>(o => o.AuthenticationScheme = authScheme) { Name = authScheme })
+                    new ConfigureOptions<BasicOptions>(o => o.AuthenticationScheme = authScheme))
         {
         }
 
diff --git a/test/WebSites/FiltersWebSite/Startup.cs b/test/WebSites/FiltersWebSite/Startup.cs
index 96301f6cfd..ded9354d7a 100644
--- a/test/WebSites/FiltersWebSite/Startup.cs
+++ b/test/WebSites/FiltersWebSite/Startup.cs
@@ -15,7 +15,7 @@ namespace FiltersWebSite
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc();
-            services.ConfigureAuthorization(options =>
+            services.AddAuthorization(options =>
             {
                 // This policy cannot succeed since the claim is never added
                 options.AddPolicy("Impossible", policy =>
@@ -43,8 +43,6 @@ namespace FiltersWebSite
             services.AddSingleton<RandomNumberFilter>();
             services.AddSingleton<RandomNumberService>();
             services.AddTransient<IAuthorizationHandler, ManagerHandler>();
-            services.Configure<BasicOptions>(o => o.AuthenticationScheme = "Api", "Api");
-            services.Configure<BasicOptions>(o => o.AuthenticationScheme = "Interactive", "Interactive");
 
             services.Configure<MvcOptions>(options =>
             {
diff --git a/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs b/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs
index b59d0b2267..8572b7a115 100644
--- a/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs
+++ b/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs
@@ -37,12 +37,12 @@ namespace UrlHelperWebSite
         /// <returns></returns>
         public override string Content(string contentPath)
         {
-            if (_appOptions.Options.ServeCDNContent
+            if (_appOptions.Value.ServeCDNContent
                 && contentPath.StartsWith("~/", StringComparison.Ordinal))
             {
                 var segment = new PathString(contentPath.Substring(1));
 
-                return ConvertToLowercaseUrl(_appOptions.Options.CDNServerBaseUrl + segment);
+                return ConvertToLowercaseUrl(_appOptions.Value.CDNServerBaseUrl + segment);
             }
 
             return ConvertToLowercaseUrl(base.Content(contentPath));
@@ -61,7 +61,7 @@ namespace UrlHelperWebSite
         private string ConvertToLowercaseUrl(string url)
         {
             if (!string.IsNullOrEmpty(url)
-                && _appOptions.Options.GenerateLowercaseUrls)
+                && _appOptions.Value.GenerateLowercaseUrls)
             {
                 return url.ToLowerInvariant();
             }
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs b/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
index f547826e11..3f65a5ef9d 100644
--- a/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
+++ b/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
@@ -46,7 +46,7 @@ namespace WebApiCompatShimWebSite
         [HttpGet]
         public string[] GetFormatters()
         {
-            return OptionsAccessor.Options.Formatters.Select(f => f.GetType().FullName).ToArray();
+            return OptionsAccessor.Value.Formatters.Select(f => f.GetType().FullName).ToArray();
         }
 
         [HttpGet]