diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index 3719049010..7171938c23 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -303,7 +303,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                     .ConfigureServices(
                     services =>
                     {
-                        services.AddEntityFramework().AddEntityFrameworkSqlServer();
+                        services.AddEntityFrameworkSqlServer();
                         var optionsBuilder = new DbContextOptionsBuilder();
                         if (!PlatformHelper.IsMono)
                         {
@@ -425,8 +425,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                     })
                     .ConfigureServices(services =>
                     {
-                        services.AddEntityFramework()
-                            .AddEntityFrameworkSqlServer();
+                        services.AddEntityFrameworkSqlServer();
 
                         services.AddScoped<TContext>();
 
diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
index 045e17c7c5..d823e83760 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
@@ -90,7 +90,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                     })
                     .ConfigureServices(services =>
                     {
-                        services.AddEntityFramework().AddEntityFrameworkSqlServer();
+                        services.AddEntityFrameworkSqlServer();
                         services.AddScoped<BloggingContextWithMigrations>();
                         services.AddSingleton(optionsBuilder.Options);
                     });
@@ -171,7 +171,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
         {
             var builder = new WebHostBuilder()
                 .Configure(app => app.UseMigrationsEndPoint())
-                .ConfigureServices(services => services.AddEntityFramework().AddEntityFrameworkSqlServer());
+                .ConfigureServices(services => services.AddEntityFrameworkSqlServer());
             var server = new TestServer(builder);
 
             var formData = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>
@@ -200,7 +200,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                     .Configure(app => app.UseMigrationsEndPoint())
                     .ConfigureServices(services =>
                     {
-                        services.AddEntityFramework().AddEntityFrameworkSqlServer();
+                        services.AddEntityFrameworkSqlServer();
                         services.AddScoped<BloggingContextWithSnapshotThatThrows>();
                         services.AddSingleton(optionsBuilder.Options);
                     });