diff --git a/src/test/regress/expected/pg16.out b/src/test/regress/expected/pg16.out
index 39fd5a29b..3d2d51896 100644
--- a/src/test/regress/expected/pg16.out
+++ b/src/test/regress/expected/pg16.out
@@ -916,6 +916,28 @@ SELECT result FROM run_command_on_workers
  REINDEX
 (2 rows)
 
+-- REINDEX DATABASE/SYSTEM name is optional
+-- We already don't propagate these commands automatically
+-- Testing here with run_command_on_workers
+-- Relevant PG commit: https://github.com/postgres/postgres/commit/2cbc3c1
+REINDEX DATABASE;
+SELECT result FROM run_command_on_workers
+($$REINDEX DATABASE$$);
+ result
+---------------------------------------------------------------------
+ REINDEX
+ REINDEX
+(2 rows)
+
+REINDEX SYSTEM;
+SELECT result FROM run_command_on_workers
+($$REINDEX SYSTEM$$);
+ result
+---------------------------------------------------------------------
+ REINDEX
+ REINDEX
+(2 rows)
+
 --
 -- random_normal() to provide normally-distributed random numbers
 -- adding here the same tests as the ones with random() in aggregate_support.sql
diff --git a/src/test/regress/sql/pg16.sql b/src/test/regress/sql/pg16.sql
index 4810c636d..30f2731e6 100644
--- a/src/test/regress/sql/pg16.sql
+++ b/src/test/regress/sql/pg16.sql
@@ -530,6 +530,19 @@ REINDEX SYSTEM;
 SELECT result FROM run_command_on_workers
 ($$REINDEX SYSTEM$$);
 
+-- REINDEX DATABASE/SYSTEM name is optional
+-- We already don't propagate these commands automatically
+-- Testing here with run_command_on_workers
+-- Relevant PG commit: https://github.com/postgres/postgres/commit/2cbc3c1
+
+REINDEX DATABASE;
+SELECT result FROM run_command_on_workers
+($$REINDEX DATABASE$$);
+
+REINDEX SYSTEM;
+SELECT result FROM run_command_on_workers
+($$REINDEX SYSTEM$$);
+
 --
 -- random_normal() to provide normally-distributed random numbers
 -- adding here the same tests as the ones with random() in aggregate_support.sql