diff --git a/contrib/btree_gist/expected/btree_gist.out b/contrib/btree_gist/expected/btree_gist.out
index a3928951e0..3cd35992e4 100644
--- a/contrib/btree_gist/expected/btree_gist.out
+++ b/contrib/btree_gist/expected/btree_gist.out
@@ -3,16 +3,18 @@
 -- does not depend on contents of btree_gist.sql.
 --
 \set ECHO none
-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:27: NOTICE:  ProcedureCreate: type int8key is not yet defined
-psql:btree_gist.sql:32: NOTICE:  Argument type "int8key" is only a shell
-psql:btree_gist.sql:44: NOTICE:  ProcedureCreate: type float4key is not yet defined
-psql:btree_gist.sql:49: NOTICE:  Argument type "float4key" is only a shell
-psql:btree_gist.sql:62: NOTICE:  ProcedureCreate: type float8key is not yet defined
-psql:btree_gist.sql:67: NOTICE:  Argument type "float8key" is only a shell
-psql:btree_gist.sql:321: NOTICE:  ProcedureCreate: type tskey is not yet defined
-psql:btree_gist.sql:326: NOTICE:  Argument type "tskey" is only a shell
+psql:btree_gist.sql:10: NOTICE:  ProcedureCreate: type int2key is not yet defined
+psql:btree_gist.sql:15: NOTICE:  Argument type "int2key" is only a shell
+psql:btree_gist.sql:27: NOTICE:  ProcedureCreate: type int4key is not yet defined
+psql:btree_gist.sql:32: NOTICE:  Argument type "int4key" is only a shell
+psql:btree_gist.sql:44: NOTICE:  ProcedureCreate: type int8key is not yet defined
+psql:btree_gist.sql:49: NOTICE:  Argument type "int8key" is only a shell
+psql:btree_gist.sql:61: NOTICE:  ProcedureCreate: type float4key is not yet defined
+psql:btree_gist.sql:66: NOTICE:  Argument type "float4key" is only a shell
+psql:btree_gist.sql:79: NOTICE:  ProcedureCreate: type float8key is not yet defined
+psql:btree_gist.sql:84: NOTICE:  Argument type "float8key" is only a shell
+psql:btree_gist.sql:394: NOTICE:  ProcedureCreate: type tskey is not yet defined
+psql:btree_gist.sql:399: NOTICE:  Argument type "tskey" is only a shell
 CREATE TABLE int4tmp (b int4);
 \copy int4tmp from 'data/test_btree.data'
 CREATE TABLE int8tmp (b int8);