diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
index e735099181..87b504fb96 100644
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@@ -1,4 +1,5 @@
 ################################# 
-run general/user/testSuite.sim
-run general/table/testSuite.sim
+run general/user/basic1.sim
+run general/db/basic1.sim
+run general/table/basic1.sim
 ################################## 
diff --git a/tests/script/general/db/basic1.sim b/tests/script/general/db/basic1.sim
new file mode 100644
index 0000000000..094c1a6930
--- /dev/null
+++ b/tests/script/general/db/basic1.sim
@@ -0,0 +1,59 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== create database
+sql create database d1
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 0 then 
+  return -1
+endi
+
+if $data03 != 0 then 
+  return -1
+endi
+
+print =============== drop database
+sql drop database d1
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== more databases
+sql create database d2
+sql create database d3
+sql create database d4
+sql show databases
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== drop database
+sql drop database d2
+sql drop database d3
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d4 then 
+  return -1
+endi
+
+if $data02 != 0 then 
+  return -1
+endi
+
+if $data03 != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/general/db/basic2.sim b/tests/script/general/db/basic2.sim
new file mode 100644
index 0000000000..a1e4533707
--- /dev/null
+++ b/tests/script/general/db/basic2.sim
@@ -0,0 +1,51 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== create database d1
+sql create database d1
+sql use d1
+sql create table t1 (ts timestamp, i int);
+sql create table t2 (ts timestamp, i int);
+sql create table t3 (ts timestamp, i int);
+sql create table t4 (ts timestamp, i int);
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 4 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show tables
+if $rows != 4 then 
+  return -1
+endi
+
+print =============== create database d2
+sql create database d2
+sql use d2
+sql create table t1 (ts timestamp, i int);
+sql create table t2 (ts timestamp, i int);
+sql create table t3 (ts timestamp, i int);
+
+sql show databases
+if $rows != 2 then 
+  return -1
+endi
+
+sql show tables
+if $rows != 3 then 
+  return -1
+endi
diff --git a/tests/script/general/db/basic3.sim b/tests/script/general/db/basic3.sim
new file mode 100644
index 0000000000..60ff4b74c7
--- /dev/null
+++ b/tests/script/general/db/basic3.sim
@@ -0,0 +1,49 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== create database d1
+sql create database d1
+sql create table d1.t1 (ts timestamp, i int);
+sql create table d1.t2 (ts timestamp, i int);
+sql create table d1.t3 (ts timestamp, i int);
+sql create table d1.t4 (ts timestamp, i int);
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 4 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show d1.tables
+if $rows != 4 then 
+  return -1
+endi
+
+print =============== create database d2
+sql create database d2
+sql create table d2.t1 (ts timestamp, i int);
+sql create table d2.t2 (ts timestamp, i int);
+sql create table d2.t3 (ts timestamp, i int);
+
+sql show databases
+if $rows != 2 then 
+  return -1
+endi
+
+sql show d2.tables
+if $rows != 3 then 
+  return -1
+endi
diff --git a/tests/script/general/db/basic4.sim b/tests/script/general/db/basic4.sim
new file mode 100644
index 0000000000..f620112cfb
--- /dev/null
+++ b/tests/script/general/db/basic4.sim
@@ -0,0 +1,118 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== create database d1
+sql create database d1
+sql create table d1.t1 (ts timestamp, i int);
+sql create table d1.t2 (ts timestamp, i int);
+sql create table d1.t3 (ts timestamp, i int);
+sql create table d1.t4 (ts timestamp, i int);
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 4 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show d1.tables
+if $rows != 4 then 
+  return -1
+endi
+
+sql show d1.vgroups
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 1 then 
+  return -1
+endi
+if $data01 != 4 then 
+  return -1
+endi
+if $data02 != ready then 
+  return -1
+endi
+
+print =============== drop table 
+sql drop table d1.t1
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 3 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show d1.tables
+if $rows != 3 then 
+  return -1
+endi
+
+sql show d1.vgroups
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 1 then 
+  return -1
+endi
+if $data01 != 3 then 
+  return -1
+endi
+if $data02 != ready then 
+  return -1
+endi
+
+print =============== drop all table 
+sql drop table d1.t2
+sql drop table d1.t3
+sql drop table d1.t4
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 0 then 
+  return -1
+endi
+
+if $data03 != 0 then 
+  return -1
+endi
+
+sql show d1.tables
+if $rows != 0 then 
+  return -1
+endi
+
+sql show d1.vgroups
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/general/db/basic5.sim b/tests/script/general/db/basic5.sim
new file mode 100644
index 0000000000..ec619389bd
--- /dev/null
+++ b/tests/script/general/db/basic5.sim
@@ -0,0 +1,57 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== create database d1
+sql create database d1
+sql create table d1.t1 (ts timestamp, i int);
+sql create table d1.t2 (ts timestamp, i int);
+sql create table d1.t3 (ts timestamp, i int);
+sql create table d1.t4 (ts timestamp, i int);
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 4 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show d1.tables
+if $rows != 4 then 
+  return -1
+endi
+
+sql show d1.vgroups
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 1 then 
+  return -1
+endi
+if $data01 != 4 then 
+  return -1
+endi
+if $data02 != ready then 
+  return -1
+endi
+
+print =============== drop table 
+sql drop database d1
+
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+sql_error show d1.vgroups
diff --git a/tests/script/general/table/basic1.sim b/tests/script/general/table/basic1.sim
new file mode 100644
index 0000000000..00e11483da
--- /dev/null
+++ b/tests/script/general/table/basic1.sim
@@ -0,0 +1,71 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== create database
+sql create database d1
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create normal table
+sql create table d1.n1 (ts timestamp, i int)
+sql show d1.tables
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create super table
+sql create table d1.st (ts timestamp, i int) tags (j int)
+sql show d1.stables
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create child table
+sql create table d1.c1 using d1.st tags(1)
+sql create table d1.c2 using d1.st tags(2)
+sql show d1.tables
+if $rows != 3 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+print $data20 $data11 $data22
+
+print =============== insert data
+sql insert into d1.n1 values(now, 1)
+sql insert into d1.n1 values(now, 2)
+sql insert into d1.n1 values(now, 3)
+
+print =============== query data
+sql select * from d1.n1
+if $rows != 3 then 
+  return -1
+endi
+
+print $data00 $data01
+print $data10 $data11
+print $data20 $data11
+
+if $data01 != 1 then 
+  return -1
+endi
+
+if $data11 != 2 then 
+  return -1
+endi
+
+if $data21 != 3 then 
+  return -1
+endi
+
diff --git a/tests/script/general/table/basic2.sim b/tests/script/general/table/basic2.sim
new file mode 100644
index 0000000000..7701ca1c1f
--- /dev/null
+++ b/tests/script/general/table/basic2.sim
@@ -0,0 +1,66 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== one table
+sql create database d1
+sql create table d1.n1 (ts timestamp, i int)
+sql create table d1.n2 (ts timestamp, i int)
+sql create table d1.n3 (ts timestamp, i int)
+sql create table d1.n4 (ts timestamp, i int)
+
+sql drop table d1.n1
+sql drop table d1.n2
+
+sql show d1.tables
+if $rows != 2 then 
+  return -1
+endi
+
+print =============== show
+sql show databases
+if $data02 != 2 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show d1.vgroups
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data01 != 2 then 
+  return -1
+endi
+
+print =============== insert data1
+sql_error insert into d1.n1 values(now, 1)
+sql_error insert into d1.n2 values(now, 1)
+
+print =============== insert data2
+sql insert into d1.n3 values(now, 1)
+sql insert into d1.n3 values(now, 2)
+sql insert into d1.n3 values(now, 3)
+
+print =============== query data
+sql select * from d1.n3
+if $rows != 3 then 
+  return -1
+endi
+
+if $data01 != 1 then 
+  return -1
+endi
+
+if $data11 != 2 then 
+  return -1
+endi
+
+if $data21 != 3 then 
+  return -1
+endi
+
diff --git a/tests/script/general/table/basic.sim b/tests/script/general/table/basic3.sim
similarity index 100%
rename from tests/script/general/table/basic.sim
rename to tests/script/general/table/basic3.sim
diff --git a/tests/script/general/table/testSuite.sim b/tests/script/general/table/testSuite.sim
deleted file mode 100644
index 32677ab1ac..0000000000
--- a/tests/script/general/table/testSuite.sim
+++ /dev/null
@@ -1,3 +0,0 @@
-################################# 
-run general/table/basic.sim
-################################## 
diff --git a/tests/script/general/user/basic.sim b/tests/script/general/user/basic1.sim
similarity index 100%
rename from tests/script/general/user/basic.sim
rename to tests/script/general/user/basic1.sim
diff --git a/tests/script/general/user/testSuite.sim b/tests/script/general/user/testSuite.sim
deleted file mode 100644
index 99414f1d29..0000000000
--- a/tests/script/general/user/testSuite.sim
+++ /dev/null
@@ -1,3 +0,0 @@
-################################# 
-#run general/user/basic.sim
-################################## 
diff --git a/tests/script/jenkins/basic1.txt b/tests/script/jenkins/basic1.txt
new file mode 100644
index 0000000000..ef6d4e239b
--- /dev/null
+++ b/tests/script/jenkins/basic1.txt
@@ -0,0 +1,11 @@
+./test.sh -f general/user/basic1.sim
+
+./test.sh -f general/db/basic1.sim
+./test.sh -f general/db/basic2.sim
+./test.sh -f general/db/basic3.sim
+./test.sh -f general/db/basic4.sim
+./test.sh -f general/db/basic5.sim
+
+./test.sh -f general/table/basic1.sim
+./test.sh -f general/table/basic2.sim
+./test.sh -f general/table/basic3.sim
\ No newline at end of file
diff --git a/tests/script/tjenkins b/tests/script/tjenkins
new file mode 100755
index 0000000000..b05ab3c900
Binary files /dev/null and b/tests/script/tjenkins differ