diff --git a/src/test/modules/unsafe_tests/expected/alter_system_table.out b/src/test/modules/unsafe_tests/expected/alter_system_table.out
index 09a557f837..ca7eabe9bb 100644
--- a/src/test/modules/unsafe_tests/expected/alter_system_table.out
+++ b/src/test/modules/unsafe_tests/expected/alter_system_table.out
@@ -152,8 +152,10 @@ BEGIN;
 ALTER TABLE pg_description SET SCHEMA public;
 ROLLBACK;
 -- reserved tablespace name
+SET client_min_messages = error;  -- disable ENFORCE_REGRESSION_TEST_NAME_RESTRICTIONS warning
 CREATE TABLESPACE pg_foo LOCATION '/no/such/location';
 ERROR:  directory "/no/such/location" does not exist
+RESET client_min_messages;
 -- triggers
 CREATE TRIGGER t1 BEFORE INSERT ON pg_description EXECUTE FUNCTION tf1();
 ALTER TRIGGER t1 ON pg_description RENAME TO t2;
diff --git a/src/test/modules/unsafe_tests/sql/alter_system_table.sql b/src/test/modules/unsafe_tests/sql/alter_system_table.sql
index 60769c8d51..44cb3c7148 100644
--- a/src/test/modules/unsafe_tests/sql/alter_system_table.sql
+++ b/src/test/modules/unsafe_tests/sql/alter_system_table.sql
@@ -166,7 +166,9 @@ ALTER TABLE pg_description SET SCHEMA public;
 ROLLBACK;
 
 -- reserved tablespace name
+SET client_min_messages = error;  -- disable ENFORCE_REGRESSION_TEST_NAME_RESTRICTIONS warning
 CREATE TABLESPACE pg_foo LOCATION '/no/such/location';
+RESET client_min_messages;
 
 -- triggers
 CREATE TRIGGER t1 BEFORE INSERT ON pg_description EXECUTE FUNCTION tf1();