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-11-14 13:59:57.949832222 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/subselect.out	2024-11-14 14:06:45.458509558 +0000
@@ -1023,15 +1023,10 @@
 explain (costs off)
 select count(*) from tenk1 t
 where (exists(select 1 from tenk1 k where k.unique1 = t.unique2) or ten < 0);
-                                QUERY PLAN                                
---------------------------------------------------------------------------
- Aggregate
-   ->  Seq Scan on tenk1 t
-         Filter: ((ANY (unique2 = (hashed SubPlan 2).col1)) OR (ten < 0))
-         SubPlan 2
-           ->  Index Only Scan using tenk1_unique1 on tenk1 k
-(5 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 42966 waits for AccessShareLock on relation 25178 of database 16387; blocked by process 42977.
+Process 42977 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 42966.
+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);
  count 
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-11-14 13:59:57.857614822 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/arrays.out	2024-11-14 14:06:45.258506999 +0000
@@ -2227,11 +2227,10 @@
 
 -- array_agg(anynonarray)
 select array_agg(unique1) from (select unique1 from tenk1 where unique1 < 15 order by unique1) ss;
-              array_agg               
---------------------------------------
- {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14}
-(1 row)
-
+ERROR:  deadlock detected
+DETAIL:  Process 42979 waits for AccessShareLock on relation 25178 of database 16387; blocked by process 42977.
+Process 42977 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 42979.
+HINT:  See server log for query details.
 select array_agg(ten) 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-11-14 13:59:57.857614822 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/btree_index.out	2024-11-14 14:06:50.638576247 +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 42980 waits for AccessShareLock on relation 25178 of database 16387; blocked by process 42977.
+Process 42977 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 42980.
+HINT:  See server log for query details.
 select hundred, twenty from tenk1 where hundred < 48 order by hundred desc limit 1;
  hundred | twenty 
 ---------+--------