diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index d3f298c2b24feee62a00520b1465b142e17d0c96..29b42d79633a6be2bbcf48870eada236552fdb05 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -1778,7 +1778,6 @@ static SSqlObj *tscCreateSqlObjForSubquery(SSqlObj *pSql, SRetrieveSupport *trsu
     pSql->pSubs[trsupport->subqueryIndex] = pNew;
   }
   
-  printf("------------alloc:%p\n", pNew);
   return pNew;
 }
 
diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c
index 0715f182b1a43c4acb5b975770632f17411f2ce3..6c8f21fec6cb1ad1d46d07b397555c0d5aabf560 100644
--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
@@ -636,7 +636,7 @@ int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pC
 
   SDbObj *pDb = mnodeGetDb(pShow->db);
   if (pDb == NULL) return 0;
-  
+
   if (pDb->status != TSDB_DB_STATUS_READY) {
     mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
     return 0;
@@ -650,6 +650,7 @@ int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pC
   while (numOfRows < rows) {
     pShow->pIter = mnodeGetNextVgroup(pShow->pIter, &pVgroup);
     if (pVgroup == NULL) break;
+    if (pVgroup->pDb != pDb) continue;
     if (!mnodeFilterVgroups(pVgroup, pTable)) continue;
 
     cols = 0;
diff --git a/tests/script/general/stream/table_replica1_vnoden.sim b/tests/script/general/stream/table_replica1_vnoden.sim
index e1d5a9babf5147ed9d4815ba00608d116d5b3773..ee0c871d98dc11a961425b69c6eda175f7d362e5 100644
--- a/tests/script/general/stream/table_replica1_vnoden.sim
+++ b/tests/script/general/stream/table_replica1_vnoden.sim
@@ -4,7 +4,8 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb   -v 3
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 99af6cf6763e4f0d9e31ad0d2cec1b06eb87f780..ee9daa97c91dc768ac977a2f0afa7e5b285b9cfe 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -245,12 +245,12 @@ cd ../../../debug; make
 ./test.sh -f unique/account/user_len.sim
 
 ./test.sh -f unique/big/balance.sim
-###./test.sh -f unique/big/maxvnodes.sim
+./test.sh -f unique/big/maxvnodes.sim
 ./test.sh -f unique/big/tcp.sim
 
 ./test.sh -f unique/cluster/balance1.sim
 ./test.sh -f unique/cluster/balance2.sim
-###./test.sh -f unique/cluster/balance3.sim
+./test.sh -f unique/cluster/balance3.sim
 ./test.sh -f unique/cluster/cache.sim
 
 ./test.sh -f unique/column/replica3.sim
@@ -321,7 +321,7 @@ cd ../../../debug; make
 ./test.sh -f general/stream/table_1.sim
 ./test.sh -f general/stream/table_del.sim
 ./test.sh -f general/stream/table_n.sim
-#./test.sh -f general/stream/table_replica1_vnoden.sim
+###./test.sh -f general/stream/table_replica1_vnoden.sim
 
 ./test.sh -f unique/arbitrator/check_cluster_cfg_para.sim
 #./test.sh -f unique/arbitrator/dn2_mn1_cache_file_sync.sim
@@ -338,31 +338,31 @@ cd ../../../debug; make
 #./test.sh -f unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
 #./test.sh -f unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
 #./test.sh -f unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
-#./test.sh -f unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
+./test.sh -f unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
 ./test.sh -f unique/arbitrator/dn3_mn1_vnode_delDir.sim
 ./test.sh -f unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
 ./test.sh -f unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim
-###./test.sh -f unique/arbitrator/dn3_mn1_vnode_nomaster.sim
+./test.sh -f unique/arbitrator/dn3_mn1_vnode_nomaster.sim
 ./test.sh -f unique/arbitrator/dn3_mn2_killDnode.sim
 ./test.sh -f unique/arbitrator/insert_duplicationTs.sim
-###./test.sh -f unique/arbitrator/offline_replica2_alterTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica2_alterTable_online.sim
 ./test.sh -f unique/arbitrator/offline_replica2_alterTag_online.sim
 ./test.sh -f unique/arbitrator/offline_replica2_createTable_online.sim
 ./test.sh -f unique/arbitrator/offline_replica2_dropDb_online.sim
 ./test.sh -f unique/arbitrator/offline_replica2_dropTable_online.sim
-###./test.sh -f unique/arbitrator/offline_replica3_alterTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_alterTable_online.sim
 ./test.sh -f unique/arbitrator/offline_replica3_alterTag_online.sim
-###./test.sh -f unique/arbitrator/offline_replica3_createTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_createTable_online.sim
 ./test.sh -f unique/arbitrator/offline_replica3_dropDb_online.sim
 ./test.sh -f unique/arbitrator/offline_replica3_dropTable_online.sim
 ./test.sh -f unique/arbitrator/replica_changeWithArbitrator.sim
-###./test.sh -f unique/arbitrator/sync_replica2_alterTable_add.sim
-###./test.sh -f unique/arbitrator/sync_replica2_alterTable_drop.sim
+./test.sh -f unique/arbitrator/sync_replica2_alterTable_add.sim
+./test.sh -f unique/arbitrator/sync_replica2_alterTable_drop.sim
 
 ./test.sh -f unique/arbitrator/sync_replica2_dropDb.sim
 ./test.sh -f unique/arbitrator/sync_replica2_dropTable.sim
-###./test.sh -f unique/arbitrator/sync_replica3_alterTable_add.sim
-###./test.sh -f unique/arbitrator/sync_replica3_alterTable_drop.sim
+./test.sh -f unique/arbitrator/sync_replica3_alterTable_add.sim
+./test.sh -f unique/arbitrator/sync_replica3_alterTable_drop.sim
 ./test.sh -f unique/arbitrator/sync_replica3_dropDb.sim
 ./test.sh -f unique/arbitrator/sync_replica3_dropTable.sim
 
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
index 9d2e6d5f505a029e9cd174c04ac8b48dca8b2c4a..7696168bb908ab4c28fd3066cf5ae445f0ace26c 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
@@ -35,10 +35,10 @@ system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
 
 $totalTableNum = 10
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 20
 
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
 system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
diff --git a/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim
index cb17d6347abd272eedeec2a50fccf60a4ff01cc0..fc1c69709a14d1faa17f43bf0ffcfb587062884c 100644
--- a/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim
@@ -30,10 +30,10 @@ system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
 system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
 
 $totalTableNum = 10
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 20
 
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
 system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
@@ -67,8 +67,8 @@ $sleepTimer = 3000
 $maxTables = $totalTableNum * 2
 
 $db = db
-print create database $db replica 3 maxTables $maxTables
-sql create database $db replica 3 maxTables $maxTables
+print create database $db replica 3
+sql create database $db replica 3
 sql use $db
 
 # create table , insert data
diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim
index ab93474a436b851bbfa4cf6cb19e715dc4b704d1..9603b5de64d42bf50e989f6b1f01f8cf7cfa9c3a 100644
--- a/tests/script/unique/big/maxvnodes.sim
+++ b/tests/script/unique/big/maxvnodes.sim
@@ -9,9 +9,11 @@ $totalRows = $totalVnodes * $maxTables
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel            -v 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes    -v $totalVnodes
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb     -v $totalVnodes
 system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c walLevel            -v 2
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes    -v $totalVnodes
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb    -v $totalVnodes
 
 
 print ==========  prepare data