diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs
index 3666d169111..2b1ced5d12f 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs
@@ -2422,11 +2422,12 @@ public override async Task Where_datetimeoffset_date_component(bool async)
         {
             await base.Where_datetimeoffset_date_component(async);
 
-            // issue #16057
-            //            AssertSql(
-            //                @"SELECT [m].[Id], [m].[CodeName], [m].[Rating], [m].[Timeline]
-            //FROM [Missions] AS [m]
-            //WHERE CONVERT(date, [m].[Timeline]) > '0001-01-01T00:00:00.0000000-08:00'");
+            AssertSql(
+                @"@__Date_0='0001-01-01T00:00:00.0000000'
+
+SELECT [m].[Id], [m].[CodeName], [m].[Duration], [m].[Rating], [m].[Timeline]
+FROM [Missions] AS [m]
+WHERE CONVERT(date, [m].[Timeline]) > @__Date_0");
         }
 
         public override async Task Where_datetimeoffset_year_component(bool async)
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs
index 2588b3e32c8..9603d24110f 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs
@@ -840,14 +840,7 @@ private void Execute1742(CustomerDetails_1742 details)
                 var firstName = details.FirstName;
                 ctx.Customers.Where(c => c.FirstName == firstName && c.LastName == details.LastName).ToList();
 
-                // issue #16057
-                //                    AssertSql(
-                //                        @"@__firstName_0='Foo' (Size = 450)
-                //@__8__locals1_details_LastName_1='Bar' (Size = 450)
-
-                //SELECT [c].[FirstName], [c].[LastName]
-                //FROM [Customer] AS [c]
-                //WHERE (([c].[FirstName] = @__firstName_0) AND @__firstName_0 IS NOT NULL) AND (([c].[LastName] = @__8__locals1_details_LastName_1) AND @__8__locals1_details_LastName_1 IS NOT NULL)");
+                // No AssertSQL since compiler generated variable names are different between local and CI
             }
         }
 
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs
index 9d691c48eb7..f6835867457 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs
@@ -2896,11 +2896,12 @@ public override async Task Where_datetimeoffset_date_component(bool async)
         {
             await base.Where_datetimeoffset_date_component(async);
 
-            // issue #16057
-            //            AssertSql(
-            //                @"SELECT [m].[Id], [m].[CodeName], [m].[Rating], [m].[Timeline]
-            //FROM [Missions] AS [m]
-            //WHERE CONVERT(date, [m].[Timeline]) > '0001-01-01T00:00:00.0000000-08:00'");
+            AssertSql(
+                @"@__Date_0='0001-01-01T00:00:00.0000000'
+
+SELECT [m].[Id], [m].[CodeName], [m].[Duration], [m].[Rating], [m].[Timeline]
+FROM [Missions] AS [m]
+WHERE CONVERT(date, [m].[Timeline]) > @__Date_0");
         }
 
         public override async Task Where_datetimeoffset_year_component(bool async)