diff --git a/tests/script/general/agg/testSuite.sim b/tests/script/general/agg/testSuite.sim
deleted file mode 100644
index 9aac0d7026..0000000000
--- a/tests/script/general/agg/testSuite.sim
+++ /dev/null
@@ -1,2 +0,0 @@
-run general/agg/fill.sim
-run general/agg/stream.sim
\ No newline at end of file
diff --git a/tests/script/general/cache/testSuite.sim b/tests/script/general/cache/testSuite.sim
index 1265a1060e..bffd4f9633 100644
--- a/tests/script/general/cache/testSuite.sim
+++ b/tests/script/general/cache/testSuite.sim
@@ -1,5 +1,3 @@
 run general/cache/restart_table.sim
 run general/cache/restart_metrics.sim
-run general/cache/restart_stream.sim
 run general/cache/new_metrics.sim
-run general/cache/new_stream.sim
diff --git a/tests/script/general/agg/stream.sim b/tests/script/general/stream/agg_stream.sim
similarity index 100%
rename from tests/script/general/agg/stream.sim
rename to tests/script/general/stream/agg_stream.sim
diff --git a/tests/script/general/column/stream.sim b/tests/script/general/stream/column_stream.sim
similarity index 100%
rename from tests/script/general/column/stream.sim
rename to tests/script/general/stream/column_stream.sim
diff --git a/tests/script/general/cache/new_stream.sim b/tests/script/general/stream/new_stream.sim
similarity index 100%
rename from tests/script/general/cache/new_stream.sim
rename to tests/script/general/stream/new_stream.sim
diff --git a/tests/script/general/cache/restart_stream.sim b/tests/script/general/stream/restart_stream.sim
similarity index 100%
rename from tests/script/general/cache/restart_stream.sim
rename to tests/script/general/stream/restart_stream.sim
diff --git a/tests/script/general/agg/fill.sim b/tests/script/general/table/fill.sim
similarity index 100%
rename from tests/script/general/agg/fill.sim
rename to tests/script/general/table/fill.sim
diff --git a/tests/script/general/table/testSuite.sim b/tests/script/general/table/testSuite.sim
index 7d0c7b9e56..6768c75dd7 100644
--- a/tests/script/general/table/testSuite.sim
+++ b/tests/script/general/table/testSuite.sim
@@ -16,6 +16,7 @@ run general/table/db.table.sim
 #run general/table/delete_writing.sim
 #run general/table/describe.sim
 run general/table/double.sim
+#run general/table/fill.sim
 run general/table/float.sim
 run general/table/int.sim
 run general/table/limit.sim
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 2a49398ad2..a9175dab35 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -9,9 +9,14 @@ cd ../../../debug; make
 
 #########  general   #########  
 
-#agg
 #alter
+
 #cache
+#./test.sh -f general/cache/restart_table.sim
+#./test.sh -f general/cache/restart_metrics.sim
+#./test.sh -f general/cache/new_metrics.sim
+
+
 #column
 #compress
 #compute
@@ -68,6 +73,7 @@ cd ../../../debug; make
 #./test.sh -f general/table/delete_writing.sim
 #./test.sh -f general/table/describe.sim
 ./test.sh -f general/table/double.sim
+#./test.sh -f general/table/fill.sim
 ./test.sh -f general/table/float.sim
 ./test.sh -f general/table/int.sim
 ./test.sh -f general/table/limit.sim
@@ -108,6 +114,7 @@ cd ../../../debug; make
 ./test.sh -u -f unique/cluster/balance1.sim
 ./test.sh -u -f unique/cluster/balance2.sim
 ./test.sh -u -f unique/cluster/balance3.sim
+#./test.sh -u -f unique/cluster/cache.sim
 
 ./test.sh -u -f unique/column/replica3.sim
 
diff --git a/tests/script/general/cache/cache_balance.sim b/tests/script/unique/cluster/cache.sim
similarity index 100%
rename from tests/script/general/cache/cache_balance.sim
rename to tests/script/unique/cluster/cache.sim
diff --git a/tests/script/unique/cluster/testSuite.sim b/tests/script/unique/cluster/testSuite.sim
index 34cdda85dd..6ef8a0dd56 100644
--- a/tests/script/unique/cluster/testSuite.sim
+++ b/tests/script/unique/cluster/testSuite.sim
@@ -1,3 +1,4 @@
 run unique/cluster/balance1.sim
 run unique/cluster/balance2.sim
 run unique/cluster/balance3.sim
+#run unique/cluster/cache.sim