diff --git a/tests/queries/0_stateless/02267_join_dup_columns_issue36199.reference b/tests/queries/0_stateless/02267_join_dup_columns_issue36199.reference
index 47e37dc8fc8..c075b08e533 100644
--- a/tests/queries/0_stateless/02267_join_dup_columns_issue36199.reference
+++ b/tests/queries/0_stateless/02267_join_dup_columns_issue36199.reference
@@ -1,2 +1,14 @@
 2	1	2
+0	1	0
+0	1	1	0
+0	1	0
+0	0	1	0
+y	0	0	1	3
+\N	0	\N	10000000000	\N
 2	1	2
+0	1	0
+0	1	1	0
+0	1	0
+0	0	1	0
+y	0	0	1	3
+\N	0	\N	10000000000	\N
diff --git a/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql b/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql
index 118d475207a..b51b3cc22e2 100644
--- a/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql
+++ b/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql
@@ -1,13 +1,22 @@
-set join_algorithm = 'hash';
+SET join_algorithm = 'hash';
 
-SELECT *
-FROM ( SELECT 2 AS x ) AS t1
-RIGHT JOIN ( SELECT count('x'), count('y'), 2 AS x ) AS t2
-ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) AS t1 RIGHT JOIN ( SELECT count('x'), count('y'), 2 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x'), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x') :: Nullable(Int32), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x') :: Nullable(Int32), count('y') :: Nullable(Int32), 0 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT count('a'), count('b'), count('c'), 2 AS x ) as t1 RIGHT JOIN ( SELECT  count('x'), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
 
-set join_algorithm = 'partial_merge';
+SELECT 'y', * FROM (SELECT count('y'), count('y'), 2 AS x) AS t1 RIGHT JOIN (SELECT count('x'), count('y'), 3 AS x) AS t2 ON t1.x = t2.x;
+SELECT * FROM (SELECT arrayJoin([NULL]), 9223372036854775806, arrayJoin([NULL]), NULL AS x) AS t1 RIGHT JOIN (SELECT arrayJoin([arrayJoin([10000000000.])]), NULL AS x) AS t2 ON t1.x = t2.x;
 
-SELECT *
-FROM ( SELECT 2 AS x ) AS t1
-RIGHT JOIN ( SELECT count('x'), count('y'), 2 AS x ) AS t2
-ON t1.x = t2.x;
+SET join_algorithm = 'partial_merge';
+
+SELECT * FROM ( SELECT 2 AS x ) AS t1 RIGHT JOIN ( SELECT count('x'), count('y'), 2 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x'), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x') :: Nullable(Int32), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x') :: Nullable(Int32), count('y') :: Nullable(Int32), 0 AS x ) AS t2 ON t1.x = t2.x;
+
+SELECT * FROM ( SELECT count('a'), count('b'), count('c'), 2 AS x ) as t1 RIGHT JOIN ( SELECT  count('x'), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
+
+SELECT 'y', * FROM (SELECT count('y'), count('y'), 2 AS x) AS t1 RIGHT JOIN (SELECT count('x'), count('y'), 3 AS x) AS t2 ON t1.x = t2.x;
+SELECT * FROM (SELECT arrayJoin([NULL]), 9223372036854775806, arrayJoin([NULL]), NULL AS x) AS t1 RIGHT JOIN (SELECT arrayJoin([arrayJoin([10000000000.])]), NULL AS x) AS t2 ON t1.x = t2.x;