diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index f847f1ac03..b975d92593 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -701,7 +701,7 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
   TAOS_CHECK_RETURN(cfgAddBool(pCfg, "multiResultFunctionStarReturnTags", tsMultiResultFunctionStarReturnTags,
                                CFG_SCOPE_CLIENT, CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL));
   TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "countAlwaysReturnValue", tsCountAlwaysReturnValue, 0, 1, CFG_SCOPE_BOTH,
-                                CFG_DYN_BOTH, CFG_CATEGORY_GLOBAL));
+                                CFG_DYN_BOTH, CFG_CATEGORY_LOCAL));
   TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "maxTsmaCalcDelay", tsMaxTsmaCalcDelay, 600, 86400, CFG_SCOPE_CLIENT,
                                 CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL));
   TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "tsmaDataDeleteMark", tsmaDataDeleteMark, 60 * 60 * 1000, INT64_MAX,
diff --git a/tests/system-test/0-others/information_schema.py b/tests/system-test/0-others/information_schema.py
index 538aa1ad63..7e5621dc75 100644
--- a/tests/system-test/0-others/information_schema.py
+++ b/tests/system-test/0-others/information_schema.py
@@ -222,7 +222,7 @@ class TDTestCase:
 
         tdSql.query("select * from information_schema.ins_columns where db_name ='information_schema'")
         tdLog.info(len(tdSql.queryResult))
-        tdSql.checkEqual(True, len(tdSql.queryResult) in range(282, 283))
+        tdSql.checkEqual(True, len(tdSql.queryResult) in range(283, 284))
 
         tdSql.query("select * from information_schema.ins_columns where db_name ='performance_schema'")
         tdSql.checkEqual(56, len(tdSql.queryResult))
diff --git a/tests/system-test/2-query/agg_group_NotReturnValue.py b/tests/system-test/2-query/agg_group_NotReturnValue.py
index 2a88812587..059a5c5f2e 100755
--- a/tests/system-test/2-query/agg_group_NotReturnValue.py
+++ b/tests/system-test/2-query/agg_group_NotReturnValue.py
@@ -1588,7 +1588,7 @@ class TDTestCase(TDTestCase):
          
         self.dropandcreateDB_random("nested", 1)
         self.modify_tables()
-        tdSql.execute('alter all dnodes "countAlwaysReturnValue" "0"')
+        tdSql.execute('alter local "countAlwaysReturnValue" "0"')
                
         self.tag_count_all()
         self.tbname_count_all()
diff --git a/tests/system-test/2-query/countAlwaysReturnValue.py b/tests/system-test/2-query/countAlwaysReturnValue.py
index 699eb7c502..a9b71c793f 100644
--- a/tests/system-test/2-query/countAlwaysReturnValue.py
+++ b/tests/system-test/2-query/countAlwaysReturnValue.py
@@ -168,7 +168,7 @@ class TDTestCase:
         tdLog.printNoPrefix("==========step1:prepare data ==============")
 
         self.prepare_data()
-        tdSql.execute('alter all dnodes  "countAlwaysReturnValue" "0"')
+        tdSql.execute('alter local "countAlwaysReturnValue" "0"')
 
         tdLog.printNoPrefix("==========step2:test results ==============")
 
diff --git a/tests/system-test/7-tmq/tmqMaxTopic.py b/tests/system-test/7-tmq/tmqMaxTopic.py
index b079d8bb67..d2f7cab0a7 100644
--- a/tests/system-test/7-tmq/tmqMaxTopic.py
+++ b/tests/system-test/7-tmq/tmqMaxTopic.py
@@ -156,6 +156,7 @@ class TDTestCase:
         alterSql = "alter all dnodes 'tmqMaxTopicNum' '22'"
         tdLog.info("alter all dnodes 'tmqMaxTopicNum' '22'")
         tdSql.execute(alterSql)
+        newTmqMaxTopicNum = 22
 
         sqlString = "create topic %s%s as %s" %(topicNamePrefix, 'x', queryString)
         tdLog.info("create topic sql: %s"%sqlString)