diff --git a/tests/queries/0_stateless/02420_final_setting.reference b/tests/queries/0_stateless/02420_final_setting.reference
index 42acc78c57e..63b09df66cf 100644
--- a/tests/queries/0_stateless/02420_final_setting.reference
+++ b/tests/queries/0_stateless/02420_final_setting.reference
@@ -66,7 +66,7 @@ explain syntax select left_table.id,val_left, val_middle, val_right from left_ta
                                                               inner join right_table on middle_table.id = right_table.id
 ORDER BY left_table.id, val_left, val_middle, val_right;
 SELECT
-    `--left_table.id` AS `left_table.id`,
+    `_--left_table.id` AS `left_table.id`,
     val_left,
     val_middle,
     val_right
@@ -74,9 +74,9 @@ FROM
 (
     SELECT
         val_left,
-        id AS `--left_table.id`,
+        id AS `_--left_table.id`,
         val_middle,
-        middle_table.id AS `--middle_table.id`
+        middle_table.id AS `_--middle_table.id`
     FROM left_table
     FINAL
     ALL INNER JOIN
@@ -85,18 +85,18 @@ FROM
             id,
             val_middle
         FROM middle_table
-    ) AS middle_table ON `--left_table.id` = `--middle_table.id`
+    ) AS middle_table ON `_--left_table.id` = `_--middle_table.id`
 ) AS `--.s`
 ALL INNER JOIN
 (
     SELECT
-        id,
-        val_right
+        val_right,
+        id AS `_--right_table.id`
     FROM right_table
     FINAL
-) AS right_table ON `--middle_table.id` = id
+) AS `--.t` ON `_--middle_table.id` = `_--right_table.id`
 ORDER BY
-    `--left_table.id` ASC,
+    `_--left_table.id` ASC,
     val_left ASC,
     val_middle ASC,
     val_right ASC
diff --git a/tests/queries/0_stateless/02420_final_setting_analyzer.reference b/tests/queries/0_stateless/02420_final_setting_analyzer.reference
index 9a03c484765..dd9fed65f13 100644
--- a/tests/queries/0_stateless/02420_final_setting_analyzer.reference
+++ b/tests/queries/0_stateless/02420_final_setting_analyzer.reference
@@ -67,7 +67,7 @@ explain syntax select left_table.id,val_left, val_middle, val_right from left_ta
                                                                              inner join right_table on middle_table.id = right_table.id
                ORDER BY left_table.id, val_left, val_middle, val_right;
 SELECT
-    `--left_table.id` AS `left_table.id`,
+    `_--left_table.id` AS `left_table.id`,
     val_left,
     val_middle,
     val_right
@@ -75,9 +75,9 @@ FROM
 (
     SELECT
         val_left,
-        id AS `--left_table.id`,
+        id AS `_--left_table.id`,
         val_middle,
-        middle_table.id AS `--middle_table.id`
+        middle_table.id AS `_--middle_table.id`
     FROM left_table
     FINAL
     ALL INNER JOIN
@@ -86,18 +86,18 @@ FROM
             id,
             val_middle
         FROM middle_table
-    ) AS middle_table ON `--left_table.id` = `--middle_table.id`
+    ) AS middle_table ON `_--left_table.id` = `_--middle_table.id`
 ) AS `--.s`
 ALL INNER JOIN
 (
     SELECT
-        id,
-        val_right
+        val_right,
+        id AS `_--right_table.id`
     FROM right_table
     FINAL
-) AS right_table ON `--middle_table.id` = id
+) AS `--.t` ON `_--middle_table.id` = `_--right_table.id`
 ORDER BY
-    `--left_table.id` ASC,
+    `_--left_table.id` ASC,
     val_left ASC,
     val_middle ASC,
     val_right ASC