diff --git a/src/backend/utils/mb/conversion_procs/regress_epilogue b/src/backend/utils/mb/conversion_procs/regress_epilogue
index da8238b9f3..fcfb45dce7 100644
--- a/src/backend/utils/mb/conversion_procs/regress_epilogue
+++ b/src/backend/utils/mb/conversion_procs/regress_epilogue
@@ -2,4 +2,4 @@
 -- return to the super user
 --
 RESET SESSION AUTHORIZATION;
-DROP USER foo;
+DROP USER conversion_test_user;
diff --git a/src/backend/utils/mb/conversion_procs/regress_prolog b/src/backend/utils/mb/conversion_procs/regress_prolog
index 62a90d20b6..5136019d62 100644
--- a/src/backend/utils/mb/conversion_procs/regress_prolog
+++ b/src/backend/utils/mb/conversion_procs/regress_prolog
@@ -1,8 +1,8 @@
 --
 -- create user defined conversion
 --
-CREATE USER foo WITH NOCREATEDB NOCREATEUSER;
-SET SESSION AUTHORIZATION foo;
+CREATE USER conversion_test_user WITH NOCREATEDB NOCREATEUSER;
+SET SESSION AUTHORIZATION conversion_test_user;
 CREATE CONVERSION myconv FOR 'LATIN1' TO 'UNICODE' FROM iso8859_1_to_utf8;
 --
 -- cannot make same name conversion in same schema