diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/subselect.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-12-18 09:55:09.368858938 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/subselect.out	2024-12-18 10:01:27.742423215 +0000
@@ -1043,19 +1043,10 @@
 select count(*) from tenk1 t
 where (exists(select 1 from tenk1 k where k.unique1 = t.unique2) or ten < 0)
   and thousand = 1;
-                          QUERY PLAN                          
---------------------------------------------------------------
- Aggregate
-   ->  Bitmap Heap Scan on tenk1 t
-         Recheck Cond: (thousand = 1)
-         Filter: (EXISTS(SubPlan 1) OR (ten < 0))
-         ->  Bitmap Index Scan on tenk1_thous_tenthous
-               Index Cond: (thousand = 1)
-         SubPlan 1
-           ->  Index Only Scan using tenk1_unique1 on tenk1 k
-                 Index Cond: (unique1 = t.unique2)
-(9 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 34421 waits for AccessShareLock on relation 25273 of database 16387; blocked by process 34437.
+Process 34437 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 34421.
+HINT:  See server log for query details.
 select count(*) from tenk1 t
 where (exists(select 1 from tenk1 k where k.unique1 = t.unique2) or ten < 0)
   and thousand = 1;
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/arrays.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/arrays.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/arrays.out	2024-12-18 09:55:09.276703355 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/arrays.out	2024-12-18 10:01:27.510422270 +0000
@@ -2233,11 +2233,10 @@
 (1 row)
 
 select array_agg(ten) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;
-            array_agg            
----------------------------------
- {0,1,2,3,4,5,6,7,8,9,0,1,2,3,4}
-(1 row)
-
+ERROR:  deadlock detected
+DETAIL:  Process 34435 waits for AccessShareLock on relation 25273 of database 16387; blocked by process 34437.
+Process 34437 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 34435.
+HINT:  See server log for query details.
 select array_agg(nullif(ten, 4)) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;
                array_agg               
 ---------------------------------------
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/btree_index.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-12-18 09:55:09.280710120 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/btree_index.out	2024-12-18 10:01:32.738443908 +0000
@@ -158,13 +158,10 @@
 set enable_bitmapscan to false;
 explain (costs off)
 select hundred, twenty from tenk1 where hundred < 48 order by hundred desc limit 1;
-                       QUERY PLAN                       
---------------------------------------------------------
- Limit
-   ->  Index Scan Backward using tenk1_hundred on tenk1
-         Index Cond: (hundred < 48)
-(3 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 34447 waits for AccessShareLock on relation 25273 of database 16387; blocked by process 34437.
+Process 34437 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 34447.
+HINT:  See server log for query details.
 select hundred, twenty from tenk1 where hundred < 48 order by hundred desc limit 1;
  hundred | twenty 
 ---------+--------