diff --git a/src/test/regress/init_file b/src/test/regress/init_file
index e2da53a1cea..25fff9c3318 100644
--- a/src/test/regress/init_file
+++ b/src/test/regress/init_file
@@ -82,6 +82,11 @@ m/^WARNING:  table ".*" contains rows in segment .*, which is outside the # of s
 # The following output is generated by \d on foreign tables, so ignore it.
 m/Distributed by: \(.*\)/
 m/Distributed randomly/
+
+# directory_table test output is sensitive to the user running the tests
+m/^NOTICE:.*storage user mapping for .* does not exist for storage server/
+m/^DETAIL:.*storage server of storage user mapping for .* on storage server/
+m/^(?:ERROR|NOTICE):.*storage user mapping for .* already exists for storage server/
 -- end_matchignore
 
 -- start_matchsubs
diff --git a/src/test/regress/input/directory_table.source b/src/test/regress/input/directory_table.source
index 5c01885db2f..9298ba3c9b9 100644
--- a/src/test/regress/input/directory_table.source
+++ b/src/test/regress/input/directory_table.source
@@ -207,14 +207,12 @@ CREATE DIRECTORY TABLE IF NOT EXISTS dir_table2 TABLESPACE directory_tblspc;
 CREATE DIRECTORY TABLE dir_table5 TABLESPACE directory_tblspc;
 CREATE DIRECTORY TABLE dir_table6 TABLESPACE pg_default;
 
-\dY
 SELECT count(*) FROM pg_directory_table;
 SELECT relname, relisshared, relpersistence, relkind FROM pg_class WHERE relname like '%dir_table%' ORDER BY 1;
 \d+ dir_table1;
 \d+ dir_table2;
 \d+ dir_table3;
 \c dirtable_db
-\dY
 SELECT count(*) FROM pg_directory_table;
 SELECT relname, relisshared, relpersistence, relkind FROM pg_class WHERE relname like '%dir_table%' ORDER BY 1;
 \c regression
@@ -231,11 +229,9 @@ DROP DIRECTORY TABLE dir_table4;    -- fail
 DROP DIRECTORY TABLE IF EXISTS dir_table5;
 DROP DIRECTORY TABLE IF EXISTS dir_table5;  -- skip
 
-\dY
 SELECT count(*) FROM pg_directory_table;
 SELECT relname, relisshared, relpersistence, relkind FROM pg_class WHERE relname like '%dir_table%' ORDER BY 1;
 \c dirtable_db
-\dY
 SELECT count(*) FROM pg_directory_table;
 SELECT relname, relisshared, relpersistence, relkind FROM pg_class WHERE relname like '%dir_table%' ORDER BY 1;
 \c regression
diff --git a/src/test/regress/output/directory_table.source b/src/test/regress/output/directory_table.source
index 1fb529faae6..52f5365dd91 100644
--- a/src/test/regress/output/directory_table.source
+++ b/src/test/regress/output/directory_table.source
@@ -528,18 +528,6 @@ CREATE DIRECTORY TABLE IF NOT EXISTS dir_table2 TABLESPACE directory_tblspc;
 NOTICE:  relation "dir_table2" already exists, skipping
 CREATE DIRECTORY TABLE dir_table5 TABLESPACE directory_tblspc;
 CREATE DIRECTORY TABLE dir_table6 TABLESPACE pg_default;
-\dY
-                List of relations
- Schema |    Name    |      Type       |  Owner  
---------+------------+-----------------+---------
- public | dir_table1 | directory table | gpadmin
- public | dir_table2 | directory table | gpadmin
- public | dir_table3 | directory table | gpadmin
- public | dir_table4 | directory table | gpadmin
- public | dir_table5 | directory table | gpadmin
- public | dir_table6 | directory table | gpadmin
-(6 rows)
-
 SELECT count(*) FROM pg_directory_table;
  count 
 -------
@@ -603,12 +591,6 @@ Indexes:
 Distributed by: (relative_path)
 
 \c dirtable_db
-\dY
-      List of relations
- Schema | Name | Type | Owner 
---------+------+------+-------
-(0 rows)
-
 SELECT count(*) FROM pg_directory_table;
  count 
 -------
@@ -643,16 +625,6 @@ ERROR:  directory table "dir_table4" does not exist
 DROP DIRECTORY TABLE IF EXISTS dir_table5;
 DROP DIRECTORY TABLE IF EXISTS dir_table5;  -- skip
 NOTICE:  directory table "dir_table5" does not exist, skipping
-\dY
-                List of relations
- Schema |    Name    |      Type       |  Owner  
---------+------------+-----------------+---------
- public | dir_table1 | directory table | gpadmin
- public | dir_table2 | directory table | gpadmin
- public | dir_table3 | directory table | gpadmin
- public | dir_table6 | directory table | gpadmin
-(4 rows)
-
 SELECT count(*) FROM pg_directory_table;
  count 
 -------
@@ -673,12 +645,6 @@ SELECT relname, relisshared, relpersistence, relkind FROM pg_class WHERE relname
 (8 rows)
 
 \c dirtable_db
-\dY
-      List of relations
- Schema | Name | Type | Owner 
---------+------+------+-------
-(0 rows)
-
 SELECT count(*) FROM pg_directory_table;
  count 
 -------
diff --git a/src/test/regress/output/directory_table_optimizer.source b/src/test/regress/output/directory_table_optimizer.source
index c1594f80cb9..61d7d42d08f 100644
--- a/src/test/regress/output/directory_table_optimizer.source
+++ b/src/test/regress/output/directory_table_optimizer.source
@@ -528,18 +528,6 @@ CREATE DIRECTORY TABLE IF NOT EXISTS dir_table2 TABLESPACE directory_tblspc;
 NOTICE:  relation "dir_table2" already exists, skipping
 CREATE DIRECTORY TABLE dir_table5 TABLESPACE directory_tblspc;
 CREATE DIRECTORY TABLE dir_table6 TABLESPACE pg_default;
-\dY
-                List of relations
- Schema |    Name    |      Type       |  Owner  
---------+------------+-----------------+---------
- public | dir_table1 | directory table | gpadmin
- public | dir_table2 | directory table | gpadmin
- public | dir_table3 | directory table | gpadmin
- public | dir_table4 | directory table | gpadmin
- public | dir_table5 | directory table | gpadmin
- public | dir_table6 | directory table | gpadmin
-(6 rows)
-
 SELECT count(*) FROM pg_directory_table;
  count 
 -------
@@ -603,12 +591,6 @@ Indexes:
 Distributed by: (relative_path)
 
 \c dirtable_db
-\dY
-      List of relations
- Schema | Name | Type | Owner 
---------+------+------+-------
-(0 rows)
-
 SELECT count(*) FROM pg_directory_table;
  count 
 -------
@@ -643,16 +625,6 @@ ERROR:  directory table "dir_table4" does not exist
 DROP DIRECTORY TABLE IF EXISTS dir_table5;
 DROP DIRECTORY TABLE IF EXISTS dir_table5;  -- skip
 NOTICE:  directory table "dir_table5" does not exist, skipping
-\dY
-                List of relations
- Schema |    Name    |      Type       |  Owner  
---------+------------+-----------------+---------
- public | dir_table1 | directory table | gpadmin
- public | dir_table2 | directory table | gpadmin
- public | dir_table3 | directory table | gpadmin
- public | dir_table6 | directory table | gpadmin
-(4 rows)
-
 SELECT count(*) FROM pg_directory_table;
  count 
 -------
@@ -673,12 +645,6 @@ SELECT relname, relisshared, relpersistence, relkind FROM pg_class WHERE relname
 (8 rows)
 
 \c dirtable_db
-\dY
-      List of relations
- Schema | Name | Type | Owner 
---------+------+------+-------
-(0 rows)
-
 SELECT count(*) FROM pg_directory_table;
  count 
 -------