diff --git a/contrib/btree_gist/expected/btree_gist.out b/contrib/btree_gist/expected/btree_gist.out
index 06699383d71b4830b7b5cfc428205e269459e933..4cd2bed3ce5751540e98f10ebfd21d82cb449eab 100644
--- a/contrib/btree_gist/expected/btree_gist.out
+++ b/contrib/btree_gist/expected/btree_gist.out
@@ -3,10 +3,10 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
-psql:btree_gist.sql:10: WARNING:  ProcedureCreate: type int4key is not yet defined
-psql:btree_gist.sql:15: WARNING:  Argument type "int4key" is only a shell
-psql:btree_gist.sql:98: WARNING:  ProcedureCreate: type tskey is not yet defined
-psql:btree_gist.sql:103: WARNING:  Argument type "tskey" is only a shell
+psql:btree_gist.sql:10: NOTICE:  ProcedureCreate: type int4key is not yet defined
+psql:btree_gist.sql:15: NOTICE:  Argument type "int4key" is only a shell
+psql:btree_gist.sql:98: NOTICE:  ProcedureCreate: type tskey is not yet defined
+psql:btree_gist.sql:103: NOTICE:  Argument type "tskey" is only a shell
 CREATE TABLE inttmp (b int4);
 \copy inttmp from 'data/test_btree.data'
 CREATE TABLE tstmp ( t timestamp without time zone );
diff --git a/contrib/cube/expected/cube.out b/contrib/cube/expected/cube.out
index 235859f8b266460e3782ea25a5a428c9eef84ec5..5eeeb0f5fc3d2dfe8f28117dd71b7a35b7433538 100644
--- a/contrib/cube/expected/cube.out
+++ b/contrib/cube/expected/cube.out
@@ -6,8 +6,8 @@
 -- does not depend on contents of cube.sql.
 --
 \set ECHO none
-psql:cube.sql:12: WARNING:  ProcedureCreate: type cube is not yet defined
-psql:cube.sql:17: WARNING:  Argument type "cube" is only a shell
+psql:cube.sql:12: NOTICE:  ProcedureCreate: type cube is not yet defined
+psql:cube.sql:17: NOTICE:  Argument type "cube" is only a shell
 --
 -- testing the input and output functions
 --
diff --git a/contrib/intarray/expected/_int.out b/contrib/intarray/expected/_int.out
index b86c9bca0c414c43c1fbf26ba1b12e42ec71a7b4..b29cf0b0ee042fde7e7269d8bba164a3d8a15b5a 100644
--- a/contrib/intarray/expected/_int.out
+++ b/contrib/intarray/expected/_int.out
@@ -3,8 +3,8 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
-psql:_int.sql:15: WARNING:  ProcedureCreate: type query_int is not yet defined
-psql:_int.sql:20: WARNING:  Argument type "query_int" is only a shell
+psql:_int.sql:15: NOTICE:  ProcedureCreate: type query_int is not yet defined
+psql:_int.sql:20: NOTICE:  Argument type "query_int" is only a shell
 SELECT intset(1234);
  intset 
 --------
diff --git a/contrib/ltree/expected/ltree.out b/contrib/ltree/expected/ltree.out
index 7e710d33354cbe86b602078d4cef3731cdad0bd9..1b6526c5e9c29e0671ad982bf80b03e3a628349e 100644
--- a/contrib/ltree/expected/ltree.out
+++ b/contrib/ltree/expected/ltree.out
@@ -1,12 +1,12 @@
 \set ECHO none
-psql:ltree.sql:9: WARNING:  ProcedureCreate: type ltree is not yet defined
-psql:ltree.sql:14: WARNING:  Argument type "ltree" is only a shell
-psql:ltree.sql:281: WARNING:  ProcedureCreate: type lquery is not yet defined
-psql:ltree.sql:286: WARNING:  Argument type "lquery" is only a shell
-psql:ltree.sql:345: WARNING:  ProcedureCreate: type ltxtquery is not yet defined
-psql:ltree.sql:350: WARNING:  Argument type "ltxtquery" is only a shell
-psql:ltree.sql:412: WARNING:  ProcedureCreate: type ltree_gist is not yet defined
-psql:ltree.sql:417: WARNING:  Argument type "ltree_gist" is only a shell
+psql:ltree.sql:9: NOTICE:  ProcedureCreate: type ltree is not yet defined
+psql:ltree.sql:14: NOTICE:  Argument type "ltree" is only a shell
+psql:ltree.sql:281: NOTICE:  ProcedureCreate: type lquery is not yet defined
+psql:ltree.sql:286: NOTICE:  Argument type "lquery" is only a shell
+psql:ltree.sql:345: NOTICE:  ProcedureCreate: type ltxtquery is not yet defined
+psql:ltree.sql:350: NOTICE:  Argument type "ltxtquery" is only a shell
+psql:ltree.sql:412: NOTICE:  ProcedureCreate: type ltree_gist is not yet defined
+psql:ltree.sql:417: NOTICE:  Argument type "ltree_gist" is only a shell
 SELECT ''::ltree;
  ltree 
 -------
diff --git a/contrib/tsearch/expected/tsearch.out b/contrib/tsearch/expected/tsearch.out
index 0c8831189fdeba4af43c9a03ec2de38788d86d61..91f28dd47d79b75445a168af99238899828cf8a3 100644
--- a/contrib/tsearch/expected/tsearch.out
+++ b/contrib/tsearch/expected/tsearch.out
@@ -3,14 +3,14 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
-psql:tsearch.sql:11: WARNING:  ProcedureCreate: type txtidx is not yet defined
-psql:tsearch.sql:16: WARNING:  Argument type "txtidx" is only a shell
-psql:tsearch.sql:40: WARNING:  ProcedureCreate: type query_txt is not yet defined
-psql:tsearch.sql:45: WARNING:  Argument type "query_txt" is only a shell
-psql:tsearch.sql:57: WARNING:  ProcedureCreate: type mquery_txt is not yet defined
-psql:tsearch.sql:63: WARNING:  Argument type "mquery_txt" is only a shell
-psql:tsearch.sql:158: WARNING:  ProcedureCreate: type gtxtidx is not yet defined
-psql:tsearch.sql:163: WARNING:  Argument type "gtxtidx" is only a shell
+psql:tsearch.sql:11: NOTICE:  ProcedureCreate: type txtidx is not yet defined
+psql:tsearch.sql:16: NOTICE:  Argument type "txtidx" is only a shell
+psql:tsearch.sql:40: NOTICE:  ProcedureCreate: type query_txt is not yet defined
+psql:tsearch.sql:45: NOTICE:  Argument type "query_txt" is only a shell
+psql:tsearch.sql:57: NOTICE:  ProcedureCreate: type mquery_txt is not yet defined
+psql:tsearch.sql:63: NOTICE:  Argument type "mquery_txt" is only a shell
+psql:tsearch.sql:158: NOTICE:  ProcedureCreate: type gtxtidx is not yet defined
+psql:tsearch.sql:163: NOTICE:  Argument type "gtxtidx" is only a shell
 --txtidx
 SELECT '1'::txtidx;
  txtidx