diff --git a/src/postgres/src/backend/utils/misc/guc.c b/src/postgres/src/backend/utils/misc/guc.c
index deb16ee10b87..a3e97af72dc3 100644
--- a/src/postgres/src/backend/utils/misc/guc.c
+++ b/src/postgres/src/backend/utils/misc/guc.c
@@ -5537,6 +5537,7 @@ static const char *const map_old_guc_names[] = {
 static const char *const YbDbAdminVariables[] = {
 	"session_replication_role",
 	"yb_make_next_ddl_statement_nonbreaking",
+	"yb_make_next_ddl_statement_nonincrementing",
 };
 
 
diff --git a/src/yb/yql/pgwrapper/pg_catalog_version-test.cc b/src/yb/yql/pgwrapper/pg_catalog_version-test.cc
index f92cf4fa726d..9f41bc310633 100644
--- a/src/yb/yql/pgwrapper/pg_catalog_version-test.cc
+++ b/src/yb/yql/pgwrapper/pg_catalog_version-test.cc
@@ -1531,6 +1531,7 @@ TEST_F(PgCatalogVersionTest, NonIncrementingDDLMode) {
   const string kDatabaseName = "yugabyte";
 
   auto conn = ASSERT_RESULT(ConnectToDB(kDatabaseName));
+  ASSERT_OK(conn.Execute("SET ROLE yb_db_admin"));
   ASSERT_OK(conn.Execute("CREATE TABLE t1(a int)"));
   auto version = ASSERT_RESULT(GetCatalogVersion(&conn));