diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index aa45ae029b..cadc689c69 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -236,9 +236,9 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                         services.AddEntityFramework().AddSqlServer();
                         services.AddScoped<BloggingContextWithMigrations>();
 
-                        var contextOptions = new DbContextOptions();
-                        contextOptions.UseSqlServer(database.ConnectionString);
-                        services.AddInstance<DbContextOptions>(contextOptions);
+                        var optionsBuilder = new DbContextOptionsBuilder();
+                        optionsBuilder.UseSqlServer(database.ConnectionString);
+                        services.AddInstance<DbContextOptions>(optionsBuilder.Options);
                     });
 
                     var options = DatabaseErrorPageOptions.ShowAll;
@@ -271,10 +271,9 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                         services.AddEntityFramework()
                             .AddSqlServer();
 
-                        var options = new DbContextOptions();
-                        options.UseSqlServer(database.ConnectionString);
-
-                        services.AddInstance<DbContextOptions>(options);
+                        var optionsBuilder = new DbContextOptionsBuilder();
+                        optionsBuilder.UseSqlServer(database.ConnectionString);
+                        services.AddInstance<DbContextOptions>(optionsBuilder.Options);
                     });
 
                     app.UseDatabaseErrorPage();
@@ -391,10 +390,9 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
 
                         services.AddScoped<TContext>();
 
-                        var options = new DbContextOptions();
-                        options.UseSqlServer(database.ConnectionString);
-
-                        services.AddInstance<DbContextOptions>(options);
+                        var optionsBuilder = new DbContextOptionsBuilder();
+                        optionsBuilder.UseSqlServer(database.ConnectionString);
+                        services.AddInstance<DbContextOptions>(optionsBuilder.Options);
                     });
 
                     app.UseDatabaseErrorPage();
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
index 72611700ff..8727f9aa6d 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
@@ -64,8 +64,9 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         {
             using (var database = SqlServerTestStore.CreateScratch())
             {
-                var options = new DbContextOptions();
-                options.UseSqlServer(database.ConnectionString);
+                var optionsBuilder = new DbContextOptionsBuilder();
+                optionsBuilder.UseSqlServer(database.ConnectionString);
+
                 var path = useCustomPath ? new PathString("/EndPoints/ApplyMyMigrations") : MigrationsEndPointOptions.DefaultPath;
 
                 TestServer server = TestServer.Create(app =>
@@ -74,7 +75,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                         {
                             services.AddEntityFramework().AddSqlServer();
                             services.AddScoped<BloggingContextWithMigrations>();
-                            services.AddInstance<DbContextOptions>(options);
+                            services.AddInstance<DbContextOptions>(optionsBuilder.Options);
                         });
 
                     if (useCustomPath)
@@ -182,8 +183,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         {
             using (var database = SqlServerTestStore.CreateScratch())
             {
-                var options = new DbContextOptions();
-                options.UseSqlServer(database.ConnectionString);
+                var optionsBuilder = new DbContextOptionsBuilder();
+                optionsBuilder.UseSqlServer(database.ConnectionString);
 
                 TestServer server = TestServer.Create(app =>
                 {
@@ -191,7 +192,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                     {
                         services.AddEntityFramework().AddSqlServer();
                         services.AddScoped<BloggingContextWithSnapshotThatThrows>();
-                        services.AddInstance<DbContextOptions>(options);
+                        services.AddInstance<DbContextOptions>(optionsBuilder.Options);
                     });
 
                     app.UseMigrationsEndPoint();
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs
index a1d52b1eb0..8c92ddaf38 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs
@@ -40,10 +40,10 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
 
         private void EnsureDeleted()
         {
-            var options = new DbContextOptions();
-            options.UseSqlServer(_connectionString);
+            var optionsBuilder = new DbContextOptionsBuilder();
+            optionsBuilder.UseSqlServer(_connectionString);
 
-            using (var db = new DbContext(options))
+            using (var db = new DbContext(optionsBuilder.Options))
             {
                 db.Database.EnsureDeleted();
             }