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	2024-10-20 18:22:11.527814667 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2024-10-20 18:32:35.918360541 +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''/>');