diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 34667b946c..0a321aa57d 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -171,6 +171,12 @@
 ./test.sh -f tsim/vnode/replica3_vgroup.sim
 #./test.sh -f tsim/vnode/replica3_many.sim
 #./test.sh -f tsim/vnode/replica3_import.sim
+#./test.sh -f tsim/vnode/stable_balance_replica1.sim
+./test.sh -f tsim/vnode/stable_dnode2_stop.sim
+./test.sh -f tsim/vnode/stable_dnode2.sim
+#./test.sh -f tsim/vnode/stable_dnode3.sim
+#./test.sh -f tsim/vnode/stable_replica3_dnode6.sim
+#./test.sh -f tsim/vnode/stable_replica3_vnode3.sim
 
 # --- sync
 ./test.sh -f tsim/sync/3Replica1VgElect.sim
diff --git a/tests/script/unique/stable/balance_replica1.sim b/tests/script/tsim/vnode/stable_balance_replica1.sim
similarity index 100%
rename from tests/script/unique/stable/balance_replica1.sim
rename to tests/script/tsim/vnode/stable_balance_replica1.sim
diff --git a/tests/script/unique/stable/dnode2.sim b/tests/script/tsim/vnode/stable_dnode2.sim
similarity index 73%
rename from tests/script/unique/stable/dnode2.sim
rename to tests/script/tsim/vnode/stable_dnode2.sim
index 3ca8c4ee20..c29d960706 100644
--- a/tests/script/unique/stable/dnode2.sim
+++ b/tests/script/tsim/vnode/stable_dnode2.sim
@@ -1,28 +1,40 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c supportVnodes -v 4
+system sh/cfg.sh -n dnode2 -c supportVnodes -v 4
+system sh/cfg.sh -n dnode3 -c supportVnodes -v 4
+system sh/cfg.sh -n dnode4 -c supportVnodes -v 4
 
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
 sql connect
 
-sql create dnode $hostname2
+sql create dnode $hostname port 7200
 system sh/exec.sh -n dnode2 -s start
 
 $x = 0
-createDnode: 
+step1:
 	$x = $x + 1
 	sleep 1000
-	if $x == 20 then 
-	  return -1
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
 	endi
-sql show dnodes;
-if $data4_2 == offline then
-  goto createDnode
-endi  
+sql show dnodes
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+if $rows != 2 then
+  return -1
+endi
+if $data(1)[4] != ready then
+  goto step1
+endi 
+if $data(2)[4] != ready then
+  goto step1
+endi
 
 print ======================== dnode1 start
 
@@ -38,7 +50,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db 
+sql create database $db vgroups 3
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
@@ -97,20 +109,20 @@ if $data00 != $rowNum then
 endi
 
 print =============== step5
-sql select count(tbcol) as b from $tb interval(1m)
+sql select _wstartts, count(tbcol) as b from $tb interval(1m)
 print ===> $data01
 if $data01 != 1 then 
   return -1
 endi
 
-sql select count(tbcol) as b from $tb interval(1d)
+sql select _wstartts, count(tbcol) as b from $tb interval(1d)
 print ===> $data01
 if $data01 != $rowNum then 
   return -1
 endi
 
 print =============== step6
-sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+sql select _wstartts, count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
 print ===> $data01
 if $data01 != 1 then 
   return -1
@@ -152,13 +164,13 @@ if $data00 != 25 then
 endi
 
 print =============== step9
-sql select count(tbcol) as b from $mt interval(1m)
+sql select _wstartts, count(tbcol) as b from $mt interval(1m)
 print ===> $data01
 if $data01 != 10 then 
   return -1
 endi
 
-sql select count(tbcol) as b from $mt interval(1d)
+sql select _wstartts, count(tbcol) as b from $mt interval(1d)
 print ===> $data01
 if $data01 != 200 then 
   return -1
@@ -175,20 +187,10 @@ if $rows != $tbNum then
   return -1
 endi
 
-print =============== step11
-sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 50 then 
-  return -1
-endi
-
 print =============== clear
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
@@ -196,7 +198,4 @@ system sh/exec.sh -n dnode1 -s stop  -x SIGINT
 system sh/exec.sh -n dnode2 -s stop  -x SIGINT
 system sh/exec.sh -n dnode3 -s stop  -x SIGINT
 system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/dnode2_stop.sim b/tests/script/tsim/vnode/stable_dnode2_stop.sim
similarity index 64%
rename from tests/script/unique/stable/dnode2_stop.sim
rename to tests/script/tsim/vnode/stable_dnode2_stop.sim
index c10f04338d..113cf27e17 100644
--- a/tests/script/unique/stable/dnode2_stop.sim
+++ b/tests/script/tsim/vnode/stable_dnode2_stop.sim
@@ -1,27 +1,40 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 2
-system sh/cfg.sh -n dnode2 -c walLevel -v 2
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c supportVnodes -v 4
+system sh/cfg.sh -n dnode2 -c supportVnodes -v 4
+system sh/cfg.sh -n dnode3 -c supportVnodes -v 4
+system sh/cfg.sh -n dnode4 -c supportVnodes -v 4
 
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
 sql connect
-sql create dnode $hostname2
+
+sql create dnode $hostname port 7200
 system sh/exec.sh -n dnode2 -s start
 
 $x = 0
-createDnode: 
+step1:
 	$x = $x + 1
 	sleep 1000
-	if $x == 20 then 
-	  return -1
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
 	endi
-sql show dnodes;
-if $data4_2 == offline then
-  goto createDnode
-endi  
+sql show dnodes
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+if $rows != 2 then
+  return -1
+endi
+if $data(1)[4] != ready then
+  goto step1
+endi 
+if $data(2)[4] != ready then
+  goto step1
+endi
 
 print ======================== dnode1 start
 
@@ -43,7 +56,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db 
+sql create database $db vgroups 3
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
@@ -72,7 +85,6 @@ endi
 sleep 100
 
 system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-sleep 3000
 
 print =============== step2
 sql select count(*) from $mt -x step2
@@ -84,7 +96,27 @@ sql select count(tbcol) from $mt  -x step21
 step21:
 
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+
+$x = 0
+dnode2:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
+sql show dnodes
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+if $rows != 2 then
+  return -1
+endi
+if $data(1)[4] != ready then
+  goto dnode2
+endi 
+if $data(2)[4] != ready then
+  goto dnode2
+endi
 
 print =============== step3
 sql select count(tbcol) as c from $mt where ts <= 1519833840000
@@ -106,13 +138,13 @@ if $data00 != 25 then
 endi
 
 print =============== step4
-sql select count(tbcol) as b from $mt interval(1m)
+sql select _wstartts, count(tbcol) as b from $mt interval(1m)
 print ===> $data01
 if $data01 != 10 then 
   return -1
 endi
 
-sql select count(tbcol) as b from $mt interval(1d)
+sql select _wstartts, count(tbcol) as b from $mt interval(1d)
 print ===> $data01
 if $data01 != 200 then 
   return -1
@@ -129,28 +161,14 @@ if $rows != $tbNum then
   return -1
 endi
 
-print =============== step6
-sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 50 then 
-  return -1
-endi
-
 print =============== clear
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT
 system sh/exec.sh -n dnode2 -s stop  -x SIGINT
 system sh/exec.sh -n dnode3 -s stop  -x SIGINT
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/dnode3.sim b/tests/script/tsim/vnode/stable_dnode3.sim
similarity index 100%
rename from tests/script/unique/stable/dnode3.sim
rename to tests/script/tsim/vnode/stable_dnode3.sim
diff --git a/tests/script/unique/stable/replica3_dnode6.sim b/tests/script/tsim/vnode/stable_replica3_dnode6.sim
similarity index 100%
rename from tests/script/unique/stable/replica3_dnode6.sim
rename to tests/script/tsim/vnode/stable_replica3_dnode6.sim
diff --git a/tests/script/unique/stable/replica3_vnode3.sim b/tests/script/tsim/vnode/stable_replica3_vnode3.sim
similarity index 100%
rename from tests/script/unique/stable/replica3_vnode3.sim
rename to tests/script/tsim/vnode/stable_replica3_vnode3.sim
diff --git a/tests/script/unique/stable/replica2_dnode4.sim b/tests/script/unique/stable/replica2_dnode4.sim
deleted file mode 100644
index 4f8211d5d4..0000000000
--- a/tests/script/unique/stable/replica2_dnode4.sim
+++ /dev/null
@@ -1,218 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode1 -c walLevel -v 2
-system sh/cfg.sh -n dnode2 -c walLevel -v 2
-system sh/cfg.sh -n dnode3 -c walLevel -v 2
-system sh/cfg.sh -n dnode4 -c walLevel -v 2
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-sql create dnode $hostname3
-sql create dnode $hostname4
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-system sh/exec.sh -n dnode4 -s start
-
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_2 == offline then
-  goto createDnode
-endi  
-if $data4_3 == offline then
-  goto createDnode
-endi  
-if $data4_4 == offline then
-  goto createDnode
-endi  
-
-print ======================== dnode1 start
-
-$dbPrefix = r2d4_db
-$tbPrefix = r2d4_tb
-$mtPrefix = r2d4_mt
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-
-sql create database $db replica 2 
-sql use $db
-sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = 0
-  while $x < $rowNum
-    $val = $x * 60000
-    $ms = 1519833600000 + $val 
-    sql insert into $tb values ($ms , $x ) 
-    $x = $x + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sql show vgroups
-print vgroups ==> $rows
-if $rows != 3 then 
-  return -1
-endi
-
-sleep 100
-
-print =============== step2
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-sql select count(tbcol) from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-print =============== step3
-sql select count(tbcol) from $tb where ts <= 1519833840000
-print ===> $data00
-if $data00 != 5 then 
-  return -1
-endi
-
-print =============== step4
-sql select count(tbcol) as b from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-print =============== step5
-sql select count(tbcol) as b from $tb interval(1m)
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-
-sql select count(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-print =============== step6
-sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 5 then 
-  return -1
-endi
-
-print =============== step7
-sql select count(*) from $mt
-print ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-sql select count(tbcol) from $mt
-print ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-print =============== step8
-sql select count(tbcol) as c from $mt where ts <= 1519833840000
-print ===> $data00
-if $data00 != 50 then 
-  return -1
-endi
-
-sql select count(tbcol) as c from $mt where tgcol < 5
-print ===> $data00
-if $data00 != 100 then 
-  return -1
-endi
-
-sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
-print ===> $data00
-if $data00 != 25 then 
-  return -1
-endi
-
-print =============== step9
-sql select count(tbcol) as b from $mt interval(1m)
-print ===> $data01
-if $data01 != 10 then 
-  return -1
-endi
-
-sql select count(tbcol) as b from $mt interval(1d)
-print ===> $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-print =============== step10
-sql select count(tbcol) as b from $mt group by tgcol
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-if $rows != $tbNum then 
-  return -1
-endi
-
-print =============== step11
-sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 50 then 
-  return -1
-endi
-return
-print =============== clear
-sql drop database $db
-sql show databases
-if $rows != 0 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/replica2_vnode3.sim b/tests/script/unique/stable/replica2_vnode3.sim
deleted file mode 100644
index 47d45c3d3d..0000000000
--- a/tests/script/unique/stable/replica2_vnode3.sim
+++ /dev/null
@@ -1,199 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 2
-system sh/cfg.sh -n dnode2 -c walLevel -v 2
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_2 == offline then
-  goto createDnode
-endi  
-
-print ======================== dnode1 start
-
-$dbPrefix = r2v3_db
-$tbPrefix = r2v3_tb
-$mtPrefix = r2v3_mt
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-
-sql create database $db replica 2 
-sql use $db
-sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = 0  
-  while $x < $rowNum
-    $val = $x * 60000
-    $ms = 1519833600000 + $val 
-    sql insert into $tb values ($ms , $x ) 
-    $x = $x + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sql show vgroups
-print vgroups ==> $rows
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step2
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-sql select count(tbcol) from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-print =============== step3
-sql select count(tbcol) from $tb where ts <= 1519833840000
-print ===> $data00
-if $data00 != 5 then 
-  return -1
-endi
-
-print =============== step4
-sql select count(tbcol) as b from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-print =============== step5
-sql select count(tbcol) as b from $tb interval(1m)
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-
-sql select count(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-print =============== step6
-sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 5 then 
-  return -1
-endi
-
-print =============== step7
-sql select count(*) from $mt
-print ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-sql select count(tbcol) from $mt
-print ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-print =============== step8
-sql select count(tbcol) as c from $mt where ts <= 1519833840000
-print ===> $data00
-if $data00 != 50 then 
-  return -1
-endi
-
-sql select count(tbcol) as c from $mt where tgcol < 5
-print ===> $data00
-if $data00 != 100 then 
-  return -1
-endi
-
-sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
-print ===> $data00
-if $data00 != 25 then 
-  return -1
-endi
-
-print =============== step9
-sql select count(tbcol) as b from $mt interval(1m)
-print ===> $data01
-if $data01 != 10 then 
-  return -1
-endi
-
-sql select count(tbcol) as b from $mt interval(1d)
-print ===> $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-print =============== step10
-sql select count(tbcol) as b from $mt group by tgcol
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-if $rows != $tbNum then 
-  return -1
-endi
-
-print =============== step11
-sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 50 then 
-  return -1
-endi
-return
-print =============== clear
-sql drop database $db
-sql show databases
-if $rows != 0 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file