diff --git a/ClickHouse.Driver.LinqService/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Driver.LinqService).sql b/ClickHouse.Driver.LinqService/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Driver.LinqService).sql
new file mode 100644
index 000000000000..b4a4931a936f
--- /dev/null
+++ b/ClickHouse.Driver.LinqService/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Driver.LinqService).sql
@@ -0,0 +1,10 @@
+BeforeExecute
+-- ClickHouse.Driver ClickHouse (asynchronously)
+
+SELECT
+	p.ID,
+	p.TS
+FROM
+	ReplacingMergeTreeTable p
+		CROSS JOIN ReplacingMergeTreeTable c_1 FINAL
+
diff --git a/ClickHouse.Driver/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Driver).sql b/ClickHouse.Driver/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Driver).sql
new file mode 100644
index 000000000000..bdfafe49356f
--- /dev/null
+++ b/ClickHouse.Driver/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Driver).sql
@@ -0,0 +1,10 @@
+BeforeExecute
+-- ClickHouse.Driver ClickHouse
+
+SELECT
+	p.ID,
+	p.TS
+FROM
+	ReplacingMergeTreeTable p
+		CROSS JOIN ReplacingMergeTreeTable c_1 FINAL
+
diff --git a/ClickHouse.MySql.LinqService/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.MySql.LinqService).sql b/ClickHouse.MySql.LinqService/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.MySql.LinqService).sql
new file mode 100644
index 000000000000..a47750f093e9
--- /dev/null
+++ b/ClickHouse.MySql.LinqService/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.MySql.LinqService).sql
@@ -0,0 +1,10 @@
+BeforeExecute
+-- ClickHouse.MySql ClickHouse (asynchronously)
+
+SELECT
+	p.ID,
+	p.TS
+FROM
+	ReplacingMergeTreeTable p
+		CROSS JOIN ReplacingMergeTreeTable c_1 FINAL
+
diff --git a/ClickHouse.MySql/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.MySql).sql
new file mode 100644
index 000000000000..374dc5a7677a
--- /dev/null
+++ b/ClickHouse.MySql/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.MySql).sql
@@ -0,0 +1,10 @@
+BeforeExecute
+-- ClickHouse.MySql ClickHouse
+
+SELECT
+	p.ID,
+	p.TS
+FROM
+	ReplacingMergeTreeTable p
+		CROSS JOIN ReplacingMergeTreeTable c_1 FINAL
+
diff --git a/ClickHouse.MySql/Tests/UserTests/Issue1174Tests/Tests.UserTests.Issue1174Tests.TestConcurrentSelect(ClickHouse.MySql).sql b/ClickHouse.MySql/Tests/UserTests/Issue1174Tests/Tests.UserTests.Issue1174Tests.TestConcurrentSelect(ClickHouse.MySql).sql
index a21dfb2bde56..12fc83e1a550 100644
--- a/ClickHouse.MySql/Tests/UserTests/Issue1174Tests/Tests.UserTests.Issue1174Tests.TestConcurrentSelect(ClickHouse.MySql).sql
+++ b/ClickHouse.MySql/Tests/UserTests/Issue1174Tests/Tests.UserTests.Issue1174Tests.TestConcurrentSelect(ClickHouse.MySql).sql
@@ -8,13 +8,3 @@ FROM
 	User t1
 LIMIT 1
 
-BeforeExecute
--- ClickHouse.MySql ClickHouse (asynchronously)
-
-SELECT
-	t1.Id,
-	t1.Name
-FROM
-	User t1
-LIMIT 1
-
diff --git a/ClickHouse.Octonica.LinqService/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Octonica.LinqService).sql b/ClickHouse.Octonica.LinqService/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Octonica.LinqService).sql
new file mode 100644
index 000000000000..a9c38758ce7c
--- /dev/null
+++ b/ClickHouse.Octonica.LinqService/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Octonica.LinqService).sql
@@ -0,0 +1,10 @@
+BeforeExecute
+-- ClickHouse.Octonica ClickHouse (asynchronously)
+
+SELECT
+	p.ID,
+	p.TS
+FROM
+	ReplacingMergeTreeTable p
+		CROSS JOIN ReplacingMergeTreeTable c_1 FINAL
+
diff --git a/ClickHouse.Octonica/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Octonica).sql b/ClickHouse.Octonica/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Octonica).sql
new file mode 100644
index 000000000000..2264bc3dbe1f
--- /dev/null
+++ b/ClickHouse.Octonica/Tests/Extensions/ClickHouseTests/Tests.Extensions.ClickHouseTests.FinalHintTest2(ClickHouse.Octonica).sql
@@ -0,0 +1,10 @@
+BeforeExecute
+-- ClickHouse.Octonica ClickHouse
+
+SELECT
+	p.ID,
+	p.TS
+FROM
+	ReplacingMergeTreeTable p
+		CROSS JOIN ReplacingMergeTreeTable c_1 FINAL
+
diff --git a/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.IssueCteDuplicateColumn(DB2.LinqService).sql b/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.IssueCteDuplicateColumn(DB2.LinqService).sql
index 1f1109269728..876977920f64 100644
--- a/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.IssueCteDuplicateColumn(DB2.LinqService).sql
+++ b/DB2.LinqService/Tests/Linq/CteTests/Tests.Linq.CteTests.IssueCteDuplicateColumn(DB2.LinqService).sql
@@ -25,10 +25,8 @@ AS
 		"t2"."Id1",
 		"record2"."Id2"
 	FROM
-		CTE_1 "t2",
-		CTE_1 "record2"
-	WHERE
-		"t2"."Id2" = "record2"."Id1"
+		CTE_1 "t2"
+			INNER JOIN CTE_1 "record2" ON "t2"."Id2" = "record2"."Id1"
 )
 SELECT
 	"t3"."Id1",
diff --git a/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.IssueCteDuplicateColumn(DB2).sql b/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.IssueCteDuplicateColumn(DB2).sql
index 5a3bcc4a8473..bb8265106e06 100644
--- a/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.IssueCteDuplicateColumn(DB2).sql
+++ b/DB2/Tests/Linq/CteTests/Tests.Linq.CteTests.IssueCteDuplicateColumn(DB2).sql
@@ -25,10 +25,8 @@ AS
 		"t2"."Id1",
 		"record2"."Id2"
 	FROM
-		CTE_1 "t2",
-		CTE_1 "record2"
-	WHERE
-		"t2"."Id2" = "record2"."Id1"
+		CTE_1 "t2"
+			INNER JOIN CTE_1 "record2" ON "t2"."Id2" = "record2"."Id1"
 )
 SELECT
 	"t3"."Id1",