diff --git a/tests/pytest/query/filterCombo.py b/tests/pytest/query/filterCombo.py
new file mode 100644
index 0000000000..a140f27000
--- /dev/null
+++ b/tests/pytest/query/filterCombo.py
@@ -0,0 +1,57 @@
+###################################################################
+#           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(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int, name nchar(16)) tags(dev nchar(50))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev_02")')
+
+        print("==============step2")
+
+        tdSql.execute(
+            """INSERT INTO dev_001(ts, tagtype, name) VALUES('2020-05-13 10:00:00.000', 1, 'first'),('2020-05-13 10:00:00.001', 2, 'second'),
+            ('2020-05-13 10:00:00.002', 3, 'third') dev_002 VALUES('2020-05-13 10:00:00.003', 1, 'first'), ('2020-05-13 10:00:00.004', 2, 'second'),
+            ('2020-05-13 10:00:00.005', 3, 'third')""")
+
+        tdSql.query("select * from db.st where ts > '2020-05-13 10:00:00.002' AND tagtype < 2")
+        tdSql.checkRows(1)
+
+        tdSql.error("select * from db.st where ts > '2020-05-13 10:00:00.002' OR tagtype < 2")
+
+        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryError.py b/tests/pytest/query/queryError.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/pytest/smoketest.sh b/tests/pytest/smoketest.sh
index 16fa38487d..8e0ccbd4b0 100755
--- a/tests/pytest/smoketest.sh
+++ b/tests/pytest/smoketest.sh
@@ -2,10 +2,14 @@
 # insert
 python3 ./test.py $1 -f insert/basic.py
 python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f query/filterCombo.py
+python3 ./test.py $1 -s && sleep 1
+
+:<<!
 python3 ./test.py $1 -f insert/int.py
 python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/float.py
-python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -s && sleep 1sss
 python3 ./test.py $1 -f insert/bigint.py
 python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/bool.py
@@ -54,4 +58,4 @@ python3 ./test.py $1 -s && sleep 1
 #query
 python3 ./test.py $1 -f query/filter.py
 python3 ./test.py $1 -s && sleep 1
-
+!
\ No newline at end of file