diff --git a/test/WebSites/BasicWebSite/Startup.cs b/test/WebSites/BasicWebSite/Startup.cs
index 4aea85a78f..b313fe8dbf 100644
--- a/test/WebSites/BasicWebSite/Startup.cs
+++ b/test/WebSites/BasicWebSite/Startup.cs
@@ -40,7 +40,7 @@ namespace BasicWebSite
 
             services.AddLogging();
             services.AddSingleton<IActionDescriptorProvider, ActionDescriptorCreationCounter>();
-            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+            services.AddHttpContextAccessor();
             services.AddSingleton<ContactsRepository>();
             services.AddSingleton<IErrorDescriptorProvider, VndErrorDescriptionProvider>();
             services.AddScoped<RequestIdService>();
diff --git a/test/WebSites/ControllersFromServicesWebSite/Startup.cs b/test/WebSites/ControllersFromServicesWebSite/Startup.cs
index dec9bcf651..fa78d51a20 100644
--- a/test/WebSites/ControllersFromServicesWebSite/Startup.cs
+++ b/test/WebSites/ControllersFromServicesWebSite/Startup.cs
@@ -40,7 +40,7 @@ namespace ControllersFromServicesWebSite
 
             services.AddTransient<QueryValueService>();
             services.AddTransient<ValueService>();
-            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+            services.AddHttpContextAccessor();
         }
 
         private class TypesPart : ApplicationPart, IApplicationPartTypeProvider