diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index 983f43729705ca44bcd511ab79b202e010fb93c6..664dbd6e5608ad53c4e19492bf73e2ca7505407c 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -32,7 +32,6 @@ python3 ./test.py -f table/create_sensitive.py
 python3 ./test.py  -f table/max_table_length.py
 python3 ./test.py -f table/alter_column.py
 python3 ./test.py -f table/boundary.py
-python3 ./test.py -f table/create-a-lot.py
 python3 ./test.py -f table/create.py
 python3 ./test.py -f table/del_stable.py
 python3 ./test.py -f table/queryWithTaosdKilled.py
@@ -213,6 +212,7 @@ python3 ./test.py -f functions/function_stddev.py -r 1
 python3 ./test.py -f functions/function_sum.py -r 1
 python3 ./test.py -f functions/function_top.py -r 1
 #python3 ./test.py -f functions/function_twa.py -r 1
+python3 ./test.py -f functions/function_twa_test2.py
 python3 queryCount.py
 python3 ./test.py -f query/queryGroupbyWithInterval.py
 python3 client/twoClients.py
diff --git a/tests/pytest/functions/function_twa_test2.py b/tests/pytest/functions/function_twa_test2.py
new file mode 100644
index 0000000000000000000000000000000000000000..744075c00967ee12f37f65cb3184cc7a1ad7b2ea
--- /dev/null
+++ b/tests/pytest/functions/function_twa_test2.py
@@ -0,0 +1,85 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+        
+        tdSql.execute("create table t1(ts timestamp, c int)")        
+        for i in range(self.rowNum):
+            tdSql.execute("insert into t1 values(%d, %d)" % (self.ts + i * 10000, i + 1))            
+
+        # twa verifacation 
+        tdSql.query("select twa(c) from t1 where ts >= '2018-09-17 09:00:00.000' and ts <= '2018-09-17 09:01:30.000' ")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 5.5)
+
+        tdSql.query("select twa(c) from t1 where ts >= '2018-09-17 09:00:00.000' and ts <= '2018-09-17 09:01:30.000' interval(10s)")
+        tdSql.checkRows(10)
+        tdSql.checkData(0, 1, 1.49995)
+        tdSql.checkData(1, 1, 2.49995)
+        tdSql.checkData(2, 1, 3.49995)
+        tdSql.checkData(3, 1, 4.49995)
+        tdSql.checkData(4, 1, 5.49995)
+        tdSql.checkData(5, 1, 6.49995)
+        tdSql.checkData(6, 1, 7.49995)
+        tdSql.checkData(7, 1, 8.49995)
+        tdSql.checkData(8, 1, 9.49995)
+        tdSql.checkData(9, 1, 10)
+
+        tdSql.query("select twa(c) from t1 where ts >= '2018-09-17 09:00:00.000' and ts <= '2018-09-17 09:01:30.000' interval(10s) sliding(5s)")
+        tdSql.checkRows(20)
+        tdSql.checkData(0, 1, 1.24995)
+        tdSql.checkData(1, 1, 1.49995)
+        tdSql.checkData(2, 1, 1.99995)
+        tdSql.checkData(3, 1, 2.49995)
+        tdSql.checkData(4, 1, 2.99995)
+        tdSql.checkData(5, 1, 3.49995)
+        tdSql.checkData(6, 1, 3.99995)
+        tdSql.checkData(7, 1, 4.49995)
+        tdSql.checkData(8, 1, 4.99995)
+        tdSql.checkData(9, 1, 5.49995)        
+        tdSql.checkData(10, 1, 5.99995)
+        tdSql.checkData(11, 1, 6.49995)
+        tdSql.checkData(12, 1, 6.99995)
+        tdSql.checkData(13, 1, 7.49995)
+        tdSql.checkData(14, 1, 7.99995)
+        tdSql.checkData(15, 1, 8.49995)
+        tdSql.checkData(16, 1, 8.99995)
+        tdSql.checkData(17, 1, 9.49995)
+        tdSql.checkData(18, 1, 9.75000)
+        tdSql.checkData(19, 1, 10)
+
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/pytest_1.sh b/tests/pytest/pytest_1.sh
index 6e0c8ef8b22b04cff87fd82db710813db273fdaa..e700175ea29fb6b208d0db97a551339168a9aa4b 100755
--- a/tests/pytest/pytest_1.sh
+++ b/tests/pytest/pytest_1.sh
@@ -206,6 +206,7 @@ python3 ./test.py -f functions/function_stddev.py -r 1
 python3 ./test.py -f functions/function_sum.py -r 1
 python3 ./test.py -f functions/function_top.py -r 1
 #python3 ./test.py -f functions/function_twa.py -r 1
+python3 ./test.py -f functions/function_twa_test2.py
 python3 queryCount.py
 python3 ./test.py -f query/queryGroupbyWithInterval.py
 python3 client/twoClients.py