diff --git a/tests/broken_tests.txt b/tests/broken_tests.txt
index 4a504e15dd8..b0a8e0fe535 100644
--- a/tests/broken_tests.txt
+++ b/tests/broken_tests.txt
@@ -124,7 +124,6 @@
 02707_skip_index_with_in
 02707_complex_query_fails_analyzer
 02680_mysql_ast_logical_err
-02516_join_with_totals_and_subquery_bug
 02324_map_combinator_bug
 02241_join_rocksdb_bs
 02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET
diff --git a/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.reference b/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.reference
index fd0b223f8e5..19da8828c30 100644
--- a/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.reference
+++ b/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.reference
@@ -2,6 +2,10 @@
 1
 
 0
+1
+1
+
+1
 \N
 
 100000000000000000000
diff --git a/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql b/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql
index b6e60aa2e1f..6b58d737a3e 100644
--- a/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql
+++ b/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql
@@ -1,3 +1,5 @@
+SET allow_experimental_analyzer = 1;
+
 SELECT *
 FROM
 (
@@ -12,7 +14,26 @@ INNER JOIN
     SELECT 1
     GROUP BY 1
         WITH TOTALS
-) AS t2 USING (a);
+) AS t2 USING (a)
+SETTINGS allow_experimental_analyzer=0;
+
+SELECT *
+FROM
+(
+    SELECT 1 AS a
+) AS t1
+INNER JOIN
+(
+    SELECT 1 AS a
+    GROUP BY 1
+        WITH TOTALS
+    UNION ALL
+    SELECT 1
+    GROUP BY 1
+        WITH TOTALS
+) AS t2 USING (a)
+SETTINGS allow_experimental_analyzer=1;
+
 
 SELECT a
 FROM