diff --git a/tests/script/tsim/stream/streamFwcIntervalFill.sim b/tests/script/tsim/stream/streamFwcIntervalFill.sim
new file mode 100644
index 0000000000..2785997428
--- /dev/null
+++ b/tests/script/tsim/stream/streamFwcIntervalFill.sim
@@ -0,0 +1,235 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 50
+sql connect
+
+print step1
+print =============== create database
+sql create database test vgroups 4;
+sql use test;
+
+sql create stable st(ts timestamp, a int, b int , c int)tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql create stream streams1 trigger force_window_close IGNORE EXPIRED 1 IGNORE UPDATE 1 into  streamt as select _wstart, count(a) as ca, now, ta, sum(b) as cb, timezone()  from st partition by tbname,ta interval(2s) fill(value, 100, 200);
+
+run tsim/stream/checkTaskStatus.sim
+
+sql insert into t1 values(now +  3000a,1,1,1) (now +  3100a,5,10,10) (now +  3200a,5,10,10)  (now + 5100a,20,1,1) (now + 5200a,30,10,10) (now + 5300a,40,10,10);
+sql insert into t2 values(now +  3000a,1,1,1) (now +  3100a,2,10,10) (now +  3200a,30,10,10) (now + 5100a,10,1,1) (now + 5200a,40,10,10) (now + 5300a,7,10,10);
+
+
+print sql select _wstart, count(a) as ca, now, ta, sum(b) as cb, timezone()  from t1 partition by tbname,ta interval(2s)
+sql select _wstart, count(a) as ca, now, ta, sum(b) as cb, timezone()  from t1 partition by tbname,ta interval(2s);
+
+$query1_data01 = $data01
+$query1_data11 = $data11
+
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+
+print sql select _wstart, count(a) as ca, now, ta, sum(b) as cb, timezone()  from t2 partition by tbname,ta interval(2s);
+sql select _wstart, count(a) as ca, now, ta, sum(b) as cb, timezone()  from t2 partition by tbname,ta interval(2s);
+
+$query2_data01 = $data01
+$query2_data11 = $data11
+
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+
+$loop_count = 0
+loop0:
+
+sleep 2000
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 2 sql select * from streamt where ta == 1 order by 1;
+sql select * from streamt where ta == 1 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+
+
+# row 0
+if $rows < 2 then
+  print ======rows=$rows
+  goto loop0
+endi
+
+if $data01 != $query1_data01 then
+  print ======data01========$data01
+  print ======query1_data01=$query1_data01
+  return -1
+endi
+
+if $data11 != $query1_data11 then
+  print ======data11========$data11
+  print ======query1_data11=$query1_data11
+  goto loop0
+endi
+
+$loop_count = 0
+loop1:
+
+sleep 2000
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 2 sql select * from streamt where ta == 2 order by 1;
+sql select * from streamt where ta == 2 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+
+# row 0
+if $rows < 2 then
+  print ======rows=$rows
+  goto loop1
+endi
+
+if $data01 != $query2_data01 then
+  print ======data01======$data01
+  print ====query2_data01=$query2_data01
+  return -1
+endi
+
+if $data11 != $query2_data11 then
+  print ======data11======$data11
+  print ====query2_data11=$query2_data11
+  goto loop1
+endi
+
+$loop_count = 0
+loop2:
+
+sleep 2000
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 2 sql select * from streamt;
+sql select * from streamt;
+
+if $rows < 6 then
+  print ======rows=$rows
+  goto loop2
+endi
+
+
+print step2
+print =============== create database
+sql create database test2 vgroups 4;
+sql use test2;
+
+sql create stable st(ts timestamp, a int, b int , c int)tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql create stream streams2 trigger force_window_close IGNORE EXPIRED 1 IGNORE UPDATE 1 into  streamt as select _wstart, count(*), ta  from st partition by tbname,ta interval(2s) fill(NULL);
+
+run tsim/stream/checkTaskStatus.sim
+
+sql insert into t1 values(now +  3000a,1,1,1) (now +  3100a,3,10,10) (now +  3200a,5,10,10) (now + 5100a,20,1,1) (now + 5200a,30,10,10) (now + 5300a,40,10,10);
+sql insert into t2 values(now +  3000a,1,1,1) (now +  3100a,3,10,10) (now +  3200a,5,10,10) (now + 5100a,10,1,1) (now + 5200a,40,10,10) (now + 5300a,7,10,10);
+
+
+print sql select _wstart, count(*)  from t1 interval(2s) order by 1;
+sql select _wstart, count(*)  from t1 interval(2s) order by 1;
+
+$query1_data01 = $data01
+$query1_data11 = $data11
+
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+
+
+$loop_count = 0
+loop3:
+
+sleep 2000
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 2 sql select * from streamt where ta == 1 order by 1;
+sql select * from streamt where ta == 1 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+
+if $data01 != $query1_data01 then
+  print ======data01======$data01
+  print ====query1_data01=$query1_data01
+  goto loop3
+endi
+
+
+sql insert into t1 values(now +  3000a,1,1,1) (now +  3100a,3,10,10) (now +  3200a,5,10,10) (now + 5100a,20,1,1) (now + 5200a,30,10,10) (now + 5300a,40,10,10);
+sql insert into t2 values(now +  3000a,1,1,1) (now +  3100a,3,10,10) (now +  3200a,5,10,10) (now + 5100a,10,1,1) (now + 5200a,40,10,10) (now + 5300a,7,10,10);
+
+$loop_count = 0
+loop4:
+
+sleep 2000
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 2 sql select * from streamt;
+sql select * from streamt;
+
+print ======step2=rows=$rows
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+
+if $rows < 10 then
+  print ======rows=$rows
+  goto loop4
+endi
+
+print end
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/stream/streamTwaFwcInterval.sim b/tests/script/tsim/stream/streamTwaFwcInterval.sim
index c9ff7ef5e8..8640650310 100644
--- a/tests/script/tsim/stream/streamTwaFwcInterval.sim
+++ b/tests/script/tsim/stream/streamTwaFwcInterval.sim
@@ -83,7 +83,7 @@ endi
 if $data11 != $query1_data11 then
   print ======data11========$data11
   print ======query1_data11=$query1_data11
-  return loop0
+  goto loop0
 endi
 
 $loop_count = 0
@@ -121,7 +121,7 @@ endi
 if $data11 != $query2_data11 then
   print ======data11======$data11
   print ====query2_data11=$query2_data11
-  return loop1
+  goto loop1
 endi
 
 
@@ -179,13 +179,13 @@ print $data50 $data51 $data52 $data53 $data54
 if $data01 != $query1_data01 then
   print ======data01======$data01
   print ====query1_data01=$query1_data01
-  return loop2
+  goto loop2
 endi
 
 if $data11 != $query1_data11 then
   print ======data11========$data11
   print ======query1_data11=$query1_data11
-  return loop2
+  goto loop2
 endi
 
 sql insert into t1 values(now +  3000a,1,1,1) (now +  3100a,3,10,10) (now +  3200a,5,10,10) (now + 5100a,20,1,1) (now + 5200a,30,10,10) (now + 5300a,40,10,10);
@@ -229,13 +229,13 @@ print $data50 $data51 $data52 $data53 $data54
 if $data21 != $query1_data21 then
   print ======data21======$data21
   print ====query1_data21=$query1_data21
-  return loop3
+  goto loop3
 endi
 
 if $data31 != $query1_data31 then
   print ======data31========$data31
   print ======query1_data31=$query1_data31
-  return loop3
+  goto loop3
 endi
 
 
@@ -280,13 +280,13 @@ print $data50 $data51 $data52 $data53 $data54
 if $data41 != $query1_data41 then
   print ======data41======$data41
   print ====query1_data41=$query1_data41
-  return loop3
+  goto loop3
 endi
 
 if $data51 != $query1_data51 then
   print ======data51========$data51
   print ======query1_data51=$query1_data51
-  return loop3
+  goto loop3
 endi
 
 print end
diff --git a/tests/script/tsim/stream/streamTwaFwcIntervalPrimaryKey.sim b/tests/script/tsim/stream/streamTwaFwcIntervalPrimaryKey.sim
index cc1a04c409..b015a5955a 100644
--- a/tests/script/tsim/stream/streamTwaFwcIntervalPrimaryKey.sim
+++ b/tests/script/tsim/stream/streamTwaFwcIntervalPrimaryKey.sim
@@ -65,7 +65,7 @@ endi
 
 if $data11 != 2 then
   print ======data11=$data11
-  return loop0
+  goto loop0
 endi
 
 $loop_count = 0
@@ -101,7 +101,7 @@ endi
 
 if $data11 != 2 then
   print ======data11=$data11
-  return loop1
+  goto loop1
 endi
 
 print end