diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/sysviews.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2025-01-16 08:54:57.798134992 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/sysviews.out	2025-01-16 08:59:45.490663180 +0000
@@ -172,7 +172,7 @@
  enable_sort                    | on
  enable_sql_func_custom_plans   | on
  enable_tidscan                 | on
-(23 rows)
+(24 rows)
 
 -- There are always wait event descriptions for various types.  InjectionPoint
 -- may be present or absent, depending on history since last postmaster start.
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/xml.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2025-01-16 08:54:57.814075251 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2025-01-16 09:00:12.906713820 +0000
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local:piece id="2" /></local:data>');
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
 SELECT xpath('/*', '<relativens xmlns=''relative''/>');