diff --git a/dbms/tests/queries/0_stateless/01223_dist_on_dist.reference b/dbms/tests/queries/0_stateless/01223_dist_on_dist.reference
new file mode 100644
index 00000000000..b2a925ca937
--- /dev/null
+++ b/dbms/tests/queries/0_stateless/01223_dist_on_dist.reference
@@ -0,0 +1,65 @@
+DISTINCT ORDER BY
+0
+1
+2
+GROUP BY ORDER BY
+0
+1
+2
+GROUP BY ORDER BY LIMIT
+0
+HAVING
+1
+1
+1
+1
+GROUP BY HAVING
+1
+ORDER BY
+0
+0
+0
+0
+1
+1
+1
+1
+2
+2
+2
+2
+ORDER BY LIMIT
+0
+ORDER BY LIMIT BY
+0
+1
+2
+cluster() ORDER BY
+0
+0
+0
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+1
+2
+2
+2
+2
+2
+2
+2
+2
+cluster() GROUP BY ORDER BY
+0
+1
+2
diff --git a/dbms/tests/queries/0_stateless/01223_dist_on_dist.sql b/dbms/tests/queries/0_stateless/01223_dist_on_dist.sql
new file mode 100644
index 00000000000..c53b95ad884
--- /dev/null
+++ b/dbms/tests/queries/0_stateless/01223_dist_on_dist.sql
@@ -0,0 +1,31 @@
+create table if not exists data_01223 (key Int) Engine=Memory();
+create table if not exists dist_layer_01223 as data_01223 Engine=Distributed(test_cluster_two_shards, currentDatabase(), data_01223);
+create table if not exists dist_01223 as data_01223 Engine=Distributed(test_cluster_two_shards, currentDatabase(), dist_layer_01223);
+
+select * from dist_01223;
+
+insert into data_01223 select * from numbers(3);
+select 'DISTINCT ORDER BY';
+select distinct * from dist_01223 order by key;
+select 'GROUP BY ORDER BY';
+select * from dist_01223 group by key order by key;
+select 'GROUP BY ORDER BY LIMIT';
+select * from dist_01223 group by key order by key limit 1;
+select 'HAVING';
+select * from dist_01223 having key = 1;
+select 'GROUP BY HAVING';
+select * from dist_01223 group by key having key = 1;
+select 'ORDER BY';
+select * from dist_01223 order by key;
+select 'ORDER BY LIMIT';
+select * from dist_01223 order by key limit 1;
+select 'ORDER BY LIMIT BY';
+select * from dist_01223 order by key limit 1 by key;
+select 'cluster() ORDER BY';
+select * from cluster(test_cluster_two_shards, currentDatabase(), dist_01223) order by key;
+select 'cluster() GROUP BY ORDER BY';
+select * from cluster(test_cluster_two_shards, currentDatabase(), dist_01223) group by key order by key;
+
+drop table dist_01223;
+drop table dist_layer_01223;
+drop table data_01223;