diff --git a/tests/script/fullGeneralSuite.sim b/tests/script/fullGeneralSuite.sim
index 2f45ab077c095a89d04b780052f5c36ac67983ee..15cc2954e87c7c6f2e23472e8e22d347844bc6cf 100644
--- a/tests/script/fullGeneralSuite.sim
+++ b/tests/script/fullGeneralSuite.sim
@@ -135,7 +135,6 @@ run general/parser/set_tag_vals.sim
 #unsupport run general/parser/repeatAlter.sim
 #unsupport run general/parser/slimit_alter_tags.sim
 #unsupport run general/parser/stream_on_sys.sim
-run general/parser/stream.sim
 #unsupport run general/parser/repeatStream.sim
 run general/stable/disk.sim
 run general/stable/dnode3.sim
@@ -212,12 +211,9 @@ run general/vector/table_mix.sim
 run general/vector/table_query.sim
 run general/vector/table_time.sim
 run general/stream/restart_stream.sim
-run general/stream/stream_1.sim
-run general/stream/stream_2.sim
 run general/stream/stream_3.sim
 run general/stream/stream_restart.sim
 run general/stream/table_1.sim
-run general/stream/metrics_1.sim
 run general/stream/table_n.sim
 run general/stream/metrics_n.sim
 run general/stream/table_del.sim
diff --git a/tests/script/sh/exec-no-random-fail.sh b/tests/script/sh/exec-no-random-fail.sh
index 04a663bc5aed52208df7183013f6989945e5f760..2bd0a64923f73df010e40f427d40cb9e212480d7 100755
--- a/tests/script/sh/exec-no-random-fail.sh
+++ b/tests/script/sh/exec-no-random-fail.sh
@@ -88,7 +88,9 @@ if [ "$EXEC_OPTON" = "start" ]; then
   echo "ExcuteCmd:" $EXE_DIR/taosd -c $CFG_DIR
   
   if [ "$SHELL_OPTION" = "true" ]; then 
-    nohup valgrind --log-file=${LOG_DIR}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes   $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 &   
+    TT=`date +%s`
+    mkdir ${LOG_DIR}/${TT}
+    nohup valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes   $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 &   
   else
     nohup $EXE_DIR/taosd -c $CFG_DIR --random-file-fail-factor 0 > /dev/null 2>&1 & 
   fi
@@ -99,12 +101,12 @@ else
   PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
   while [ -n "$PID" ]
   do
-    if [ "$SIGNAL" = "SIGINT" ]; then 
-      echo try to kill by signal SIGINT
-      kill -SIGINT $PID
-    else
+    if [ "$SIGNAL" = "SIGKILL" ]; then
       echo try to kill by signal SIGKILL
       kill -9 $PID
+    else
+      echo try to kill by signal SIGINT
+      kill -SIGINT $PID
     fi
     sleep 1
     PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
diff --git a/tests/script/sh/exec-random-fail.sh b/tests/script/sh/exec-random-fail.sh
index a354021684884781e0157b011cf378dfb00dd924..3761498859591188799d1ad3814ed3b01372269d 100755
--- a/tests/script/sh/exec-random-fail.sh
+++ b/tests/script/sh/exec-random-fail.sh
@@ -88,9 +88,12 @@ if [ "$EXEC_OPTON" = "start" ]; then
   echo "ExcuteCmd:" $EXE_DIR/taosd -c $CFG_DIR
   
   if [ "$SHELL_OPTION" = "true" ]; then 
-    nohup valgrind --log-file=${LOG_DIR}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes   $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 &   
+    TT=`date +%s`
+    mkdir ${LOG_DIR}/${TT}
+    nohup valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes   $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 &   
   else
-    nohup $EXE_DIR/taosd -c $CFG_DIR --alloc-random-fail --random-file-fail-factor 5 > /dev/null 2>&1 & 
+    nohup $EXE_DIR/taosd -c $CFG_DIR  --alloc-random-fail \
+      --random-file-fail-factor 5 > /dev/null 2>&1 & 
   fi
   
 else
@@ -99,12 +102,12 @@ else
   PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
   while [ -n "$PID" ]
   do
-    if [ "$SIGNAL" = "SIGINT" ]; then 
-      echo try to kill by signal SIGINT
-      kill -SIGINT $PID
-    else
+    if [ "$SIGNAL" = "SIGKILL" ]; then
       echo try to kill by signal SIGKILL
       kill -9 $PID
+    else
+      echo try to kill by signal SIGINT
+      kill -SIGINT $PID
     fi
     sleep 1
     PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
diff --git a/tests/script/sh/exec.sh b/tests/script/sh/exec.sh
index 2f294075a1695298cb52b53bc52e11d9dce9fe07..1c84a6b10ed3f958e096d32eda727441ff2591da 100755
--- a/tests/script/sh/exec.sh
+++ b/tests/script/sh/exec.sh
@@ -101,12 +101,12 @@ else
   PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
   while [ -n "$PID" ]
   do
-    if [ "$SIGNAL" = "SIGINT" ]; then 
-      echo try to kill by signal SIGINT
-      kill -SIGINT $PID
-    else
+    if [ "$SIGNAL" = "SIGKILL" ]; then
       echo try to kill by signal SIGKILL
       kill -9 $PID
+    else
+      echo try to kill by signal SIGINT
+      kill -SIGINT $PID
     fi
     sleep 1
     PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`