diff --git a/tests/queries/0_stateless/03054_analyzer_join_alias.reference b/tests/queries/0_stateless/03054_analyzer_join_alias.reference
new file mode 100644
index 00000000000..f599e28b8ab
--- /dev/null
+++ b/tests/queries/0_stateless/03054_analyzer_join_alias.reference
@@ -0,0 +1 @@
+10
diff --git a/tests/queries/0_stateless/03054_analyzer_join_alias.sql b/tests/queries/0_stateless/03054_analyzer_join_alias.sql
new file mode 100644
index 00000000000..0bf93258aa6
--- /dev/null
+++ b/tests/queries/0_stateless/03054_analyzer_join_alias.sql
@@ -0,0 +1,12 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/21584
+SELECT count()
+FROM
+(
+    SELECT number AS key_1
+    FROM numbers(15)
+) AS x
+ALL INNER JOIN
+(
+    SELECT number AS key_1
+    FROM numbers(10)
+) AS z ON key_1 = z.key_1;