diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
index 297b3dc3ec..c1d37edcd3 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
@@ -53,7 +53,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
             _logger = loggerFactory.CreateLogger<DatabaseErrorPageMiddleware>();
 
             _loggerProvider = new DataStoreErrorLoggerProvider();
+#pragma warning disable CS0618 // Type or member is obsolete
             loggerFactory.AddProvider(_loggerProvider);
+#pragma warning restore CS0618 // Type or member is obsolete
         }
 
         /// <summary>
diff --git a/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index a68091686d..849d17e186 100644
--- a/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -317,7 +317,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                 {
                     app.UseDatabaseErrorPage();
                     app.UseMiddleware<ContextNotRegisteredInServicesMiddleware>();
+#pragma warning disable CS0618 // Type or member is obsolete
                     app.ApplicationServices.GetService<ILoggerFactory>().AddProvider(logProvider);
+#pragma warning restore CS0618 // Type or member is obsolete
                 });
             var server = new TestServer(builder);
 
@@ -457,7 +459,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
 
                     if (logProvider != null)
                     {
+#pragma warning disable CS0618 // Type or member is obsolete
                         app.ApplicationServices.GetService<ILoggerFactory>().AddProvider(logProvider);
+#pragma warning restore CS0618 // Type or member is obsolete
                     }
                 })
                 .ConfigureServices(services =>