diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/eager_aggregate.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/eager_aggregate.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/eager_aggregate.out	2024-07-25 15:59:50.853720047 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/eager_aggregate.out	2024-07-25 16:07:03.217415096 +0000
@@ -295,12 +295,12 @@
  Finalize GroupAggregate
    Output: t1.a, avg(t2.c)
    Group Key: t1.a
-   ->  Sort
+   ->  Gather Merge
          Output: t1.a, (PARTIAL avg(t2.c))
-         Sort Key: t1.a
-         ->  Gather
+         Workers Planned: 2
+         ->  Sort
                Output: t1.a, (PARTIAL avg(t2.c))
-               Workers Planned: 2
+               Sort Key: t1.a
                ->  Parallel Hash Join
                      Output: t1.a, (PARTIAL avg(t2.c))
                      Hash Cond: (t1.b = t2.b)