diff --git a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
index 6c672b72ab3b..2452b80e3592 100644
--- a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
@@ -6062,7 +6062,6 @@ private HepProgram getTransitiveProgram() {
         .check();
   }
 
-  @Disabled
   @Test void testMeasureJoin() {
     final String sql = "with deptm as\n"
         + "  (select deptno, name, avg(char_length(name)) as measure m\n"
@@ -6075,7 +6074,7 @@ private HepProgram getTransitiveProgram() {
             t.withOperatorTable(opTab ->
                 SqlLibraryOperatorTableFactory.INSTANCE.getOperatorTable(
                     SqlLibrary.STANDARD, SqlLibrary.CALCITE))) // for AGGREGATE
-        .withRule(MeasureRules.AGGREGATE,
+        .withRule(MeasureRules.AGGREGATE2,
             CoreRules.PROJECT_MERGE,
             MeasureRules.PROJECT)
         .check();
diff --git a/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml b/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
index 0ebdb9b469d4..6bedf930b814 100644
--- a/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
@@ -6753,10 +6753,11 @@ LogicalProject(DEPTNO=[$0], C1=[$1])
   </TestCase>
   <TestCase name="testMeasureJoin">
     <Resource name="sql">
-      <![CDATA[select deptno, aggregate(m) as m
-from (select deptno, name, avg(char_length(name)) as measure m
-  from dept)
-join emp using (deptno)
+      <![CDATA[with deptm as
+  (select deptno, name, avg(char_length(name)) as measure m
+   from dept)
+select deptno, aggregate(m) as m
+from deptm join emp using (deptno)
 group by deptno]]>
     </Resource>
     <Resource name="planBefore">
@@ -6774,7 +6775,7 @@ LogicalProject(DEPTNO=[$0], M=[$1])
       <![CDATA[
 LogicalProject(DEPTNO=[$0], M=[$1])
   LogicalAggregate(group=[{0}], agg#0=[SINGLE_VALUE($1)])
-    LogicalProject($f0=[$0], $f2=[M2X($2, SAME_PARTITION($0))])
+    LogicalProject($f0=[$0], $f2=[TODO($2, SAME_PARTITION($0))])
       LogicalJoin(condition=[=($0, $10)], joinType=[inner])
         LogicalProject(DEPTNO=[$0], NAME=[$1], M=[V2M(CAST(/(SUM(CHAR_LENGTH($1)), COUNT(CHAR_LENGTH($1)))):INTEGER NOT NULL)])
           LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
diff --git a/core/src/test/resources/sql/measure.iq b/core/src/test/resources/sql/measure.iq
index aa8ee999fd77..0660f4113d06 100644
--- a/core/src/test/resources/sql/measure.iq
+++ b/core/src/test/resources/sql/measure.iq
@@ -395,6 +395,14 @@ where job = 'MANAGER';
 
 !ok
 
+# [CALCITE-6525] Query with one-to-many join of measure to regular table
+with deptm as
+  (select deptno, dname, avg(char_length(dname)) as measure m
+   from dept)
+select aggregate(m) as m
+from deptm join emp using (deptno);
+!ok
+
 # Measure that references another measure
 select *
 from (