diff --git a/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index 328a9353db..69e4f7463d 100644
--- a/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -341,7 +341,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                         .UseLoggerFactory(context.RequestServices.GetService<ILoggerFactory>());
                     if (!PlatformHelper.IsMono)
                     {
-                        optionsBuilder.UseSqlServer(database.ConnectionString);
+                        optionsBuilder.UseSqlServer(database.ConnectionString, b => b.CommandTimeout(600));
                     }
                     else
                     {
diff --git a/test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs b/test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs
index e6fbcff6cb..4a60fa40a0 100644
--- a/test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs
+++ b/test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs
@@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                 DataSource = @"(localdb)\MSSQLLocalDB",
                 InitialCatalog = name,
                 IntegratedSecurity = true,
-                ConnectTimeout = 30
+                ConnectTimeout = 600
             }.ConnectionString;
         }
 
@@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
             if (!PlatformHelper.IsMono)
             {
                 var optionsBuilder = new DbContextOptionsBuilder();
-                optionsBuilder.UseSqlServer(_connectionString);
+                optionsBuilder.UseSqlServer(_connectionString, b => b.CommandTimeout(600));
 
                 using (var db = new DbContext(optionsBuilder.Options))
                 {