diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/src/test/regress/results/subselect.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2026-01-21 06:10:20.601892332 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/subselect.out	2026-01-21 06:16:20.262325450 +0000
@@ -1964,23 +1964,20 @@
 select * from
   (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
   where ss.v;
-                         QUERY PLAN                         
-------------------------------------------------------------
+                      QUERY PLAN                      
+------------------------------------------------------
  Subquery Scan on ss
    Output: ss.v, ss.count
    Filter: ss.v
-   ->  GroupAggregate
+   ->  IndexAggregate
          Output: (tattle(3, tenk1.ten)), count(*)
-         Group Key: (tattle(3, tenk1.ten))
-         ->  Sort
-               Output: (tattle(3, tenk1.ten))
-               Sort Key: (tattle(3, tenk1.ten))
-               ->  Bitmap Heap Scan on public.tenk1
-                     Output: tattle(3, tenk1.ten)
-                     Recheck Cond: (tenk1.unique1 < 3)
-                     ->  Bitmap Index Scan on tenk1_unique1
-                           Index Cond: (tenk1.unique1 < 3)
-(14 rows)
+         Group Key: tattle(3, tenk1.ten)
+         ->  Bitmap Heap Scan on public.tenk1
+               Output: tattle(3, tenk1.ten)
+               Recheck Cond: (tenk1.unique1 < 3)
+               ->  Bitmap Index Scan on tenk1_unique1
+                     Index Cond: (tenk1.unique1 < 3)
+(11 rows)
 
 select * from
   (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
@@ -1999,21 +1996,18 @@
 select * from
   (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss
   where ss.v;
-                      QUERY PLAN                      
-------------------------------------------------------
- GroupAggregate
+                   QUERY PLAN                   
+------------------------------------------------
+ IndexAggregate
    Output: (tattle(3, tenk1.ten)), count(*)
-   Group Key: (tattle(3, tenk1.ten))
-   ->  Sort
-         Output: (tattle(3, tenk1.ten))
-         Sort Key: (tattle(3, tenk1.ten))
-         ->  Bitmap Heap Scan on public.tenk1
-               Output: tattle(3, tenk1.ten)
-               Recheck Cond: (tenk1.unique1 < 3)
-               Filter: tattle(3, tenk1.ten)
-               ->  Bitmap Index Scan on tenk1_unique1
-                     Index Cond: (tenk1.unique1 < 3)
-(12 rows)
+   Group Key: tattle(3, tenk1.ten)
+   ->  Bitmap Heap Scan on public.tenk1
+         Output: tattle(3, tenk1.ten)
+         Recheck Cond: (tenk1.unique1 < 3)
+         Filter: tattle(3, tenk1.ten)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (tenk1.unique1 < 3)
+(9 rows)
 
 select * from
   (select tattle(3, ten) as v, count(*) from tenk1 where unique1 < 3 group by 1) ss