diff --git a/tests/pytest/query/queryStateWindow.py b/tests/pytest/query/queryStateWindow.py
new file mode 100644
index 0000000000000000000000000000000000000000..027ece89af177dc45714b7923d8f15ff6946910c
--- /dev/null
+++ b/tests/pytest/query/queryStateWindow.py
@@ -0,0 +1,92 @@
+###################################################################
+#           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 *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+        self.rowNum = 100000
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, t1 int, t2 timestamp, t3 bigint, t4 float, t5 double, t6 binary(10), t7 smallint, t8 tinyint, t9 bool, t10 nchar(10), t11 int unsigned, t12 bigint unsigned, t13 smallint unsigned, t14 tinyint unsigned ) tags(dev nchar(50), tag2 binary(16))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01", "tag_01")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev_02", "tag_02")') 
+
+        print("==============step2")
+
+        tdSql.execute(
+            "INSERT INTO dev_001 VALUES('2020-05-13 10:00:00.000', 1, '2020-05-13 10:00:00.000', 10, 3.1, 3.14, 'test', -10, -126, true, '测试', 15, 10, 65534, 254)('2020-05-13 10:00:01.000', 1, '2020-05-13 10:00:01.000', 10, 3.1, 3.14, 'test', -10, -126, true, '测试', 15, 10, 65534, 253)('2020-05-13 10:00:02.000', 10, '2020-05-13 10:00:00.000', 11, 3.1, 3.14, 'test', 10, -127, true, '测试', 15, 10, 65534, 253)('2020-05-13 10:00:03.000', 1, '2020-05-13 10:00:00.000', 11, 3.1, 3.14, 'test', -10, -126, true, '测试', 14, 12, 65532, 254)")
+
+        for i in range(self.rowNum):
+            tdSql.execute("insert into dev_002 (ts,t1) values(%d, %d,)" % (self.ts + i, i + 1))
+
+        tdSql.query("select count(ts) from dev_001 state_window(t1)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0, 0, 2)
+        tdSql.query("select count(ts) from dev_001 state_window(t3)")
+        tdSql.checkRows(2)
+        tdSql.checkData(1, 0, 2)
+        tdSql.query("select count(ts) from dev_001 state_window(t7)")
+        tdSql.checkRows(3)
+        tdSql.checkData(1, 0, 1)
+        tdSql.query("select count(ts) from dev_001 state_window(t8)")
+        tdSql.checkRows(3)
+        tdSql.checkData(2, 0, 1)     
+        tdSql.query("select count(ts) from dev_001 state_window(t11)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 0, 3)     
+        tdSql.query("select count(ts) from dev_001 state_window(t12)")
+        tdSql.checkRows(2)
+        tdSql.checkData(1, 0, 1)     
+        tdSql.query("select count(ts) from dev_001 state_window(t13)")
+        tdSql.checkRows(2)
+        tdSql.checkData(1, 0, 1)         
+        tdSql.query("select count(ts) from dev_001 state_window(t14)")
+        tdSql.checkRows(3)
+        tdSql.checkData(1, 0, 2)
+        tdSql.query("select count(ts) from dev_002 state_window(t1)")
+        tdSql.checkRows(100000)   
+
+        # error      
+        tdSql.query("select count(ts) from dev_001 state_window(t7)")
+        tdSql.error("select count(*) from dev_001 state_window(t2)")
+        tdSql.error("select count(*) from st state_window(t3)")
+        tdSql.error("select count(*) from dev_001 state_window(t4)")
+        tdSql.error("select count(*) from dev_001 state_window(t5)")
+        tdSql.error("select count(*) from dev_001 state_window(t6)")
+        tdSql.error("select count(*) from dev_001 state_window(t9)")
+        tdSql.error("select count(*) from dev_001 state_window(t10)")
+        tdSql.error("select count(*) from dev_001 state_window(tag2)")
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())