diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/goo.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/goo.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/goo.out	2025-12-31 14:33:42.692071913 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/goo.out	2025-12-31 14:39:28.750361799 +0000
@@ -132,8 +132,8 @@
 JOIN dim3 ON fact.dim3_id = dim3.id
 JOIN dim4 ON fact.dim4_id = dim4.id
 WHERE dim1.id < 5;
-                                QUERY PLAN                                 
----------------------------------------------------------------------------
+                             QUERY PLAN                              
+---------------------------------------------------------------------
  Aggregate
    ->  Nested Loop
          Join Filter: (fact.dim4_id = dim4.id)
@@ -142,15 +142,15 @@
                ->  Seq Scan on dim3
                ->  Hash
                      ->  Hash Join
-                           Hash Cond: (dim2.id = fact.dim2_id)
-                           ->  Seq Scan on dim2
+                           Hash Cond: (fact.dim1_id = dim1.id)
+                           ->  Hash Join
+                                 Hash Cond: (fact.dim2_id = dim2.id)
+                                 ->  Seq Scan on fact
+                                 ->  Hash
+                                       ->  Seq Scan on dim2
                            ->  Hash
-                                 ->  Hash Join
-                                       Hash Cond: (fact.dim1_id = dim1.id)
-                                       ->  Seq Scan on fact
-                                       ->  Hash
-                                             ->  Seq Scan on dim1
-                                                   Filter: (id < 5)
+                                 ->  Seq Scan on dim1
+                                       Filter: (id < 5)
          ->  Seq Scan on dim4
 (18 rows)
 
@@ -452,22 +452,22 @@
 FROM t1 JOIN t2 ON t1.a = t2.a,
      t5 JOIN t6 ON t5.f = t6.e
 WHERE t1.a < 5 AND t5.d < 3;
-                      QUERY PLAN                       
--------------------------------------------------------
+                   QUERY PLAN                    
+-------------------------------------------------
  Aggregate
    ->  Hash Join
          Hash Cond: (t2.a = t1.a)
-         ->  Seq Scan on t2
+         ->  Nested Loop
+               ->  Hash Join
+                     Hash Cond: (t6.e = t5.f)
+                     ->  Seq Scan on t6
+                     ->  Hash
+                           ->  Seq Scan on t5
+                                 Filter: (d < 3)
+               ->  Seq Scan on t2
          ->  Hash
-               ->  Nested Loop
-                     ->  Hash Join
-                           Hash Cond: (t6.e = t5.f)
-                           ->  Seq Scan on t6
-                           ->  Hash
-                                 ->  Seq Scan on t5
-                                       Filter: (d < 3)
-                     ->  Seq Scan on t1
-                           Filter: (a < 5)
+               ->  Seq Scan on t1
+                     Filter: (a < 5)
 (14 rows)
 
 --