diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 61687eeccd..bed1c20421 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -535,6 +535,8 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/mavg.py -R
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/max_partition.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/max_partition.py -R
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/partition_limit_interval.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/partition_limit_interval.py -R
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/max_min_last_interval.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/last_row_interval.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/max.py
@@ -779,6 +781,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/function_null.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/count_partition.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/max_partition.py -Q 2
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/partition_limit_interval.py  -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/max_min_last_interval.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/last_row_interval.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/last_row.py -Q 2
@@ -874,6 +877,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/function_null.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/count_partition.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/max_partition.py -Q 3
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/partition_limit_interval.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/max_min_last_interval.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/last_row_interval.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/last_row.py -Q 3
@@ -971,6 +975,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/function_null.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/count_partition.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/max_partition.py -Q 4
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/partition_limit_interval.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/max_min_last_interval.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/last_row_interval.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/last_row.py -Q 4
diff --git a/tests/system-test/2-query/partition_limit_interval.py b/tests/system-test/2-query/partition_limit_interval.py
new file mode 100755
index 0000000000..287c7b7619
--- /dev/null
+++ b/tests/system-test/2-query/partition_limit_interval.py
@@ -0,0 +1,105 @@
+from util.log import *
+from util.sql import *
+from util.cases import *
+
+class TDTestCase:
+    def init(self, conn, logSql, replicaVar=1):
+        self.replicaVar = int(replicaVar)
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), True)
+
+        self.row_nums = 1000
+        self.tb_nums = 10
+        self.ts = 1537146000000
+        self.dbname = "db1"
+        self.stable = "meters"
+
+    def prepare_datas(self, stb_name , tb_nums , row_nums, dbname="db" ):
+        tdSql.execute(f'''create database db1 MAXROWS 4096 MINROWS 100''')
+        tdSql.execute(f'''use {self.dbname}''')
+        tdSql.execute(f'''CREATE STABLE {self.stable} (`ts` TIMESTAMP, `current` FLOAT, `voltage` INT) TAGS (`groupid` TINYINT, `location` VARCHAR(16))''')
+        
+        for i in range(self.tb_nums):
+            tbname = f"{self.dbname}.sub_{self.stable}_{i}"
+            ts = self.ts + i*10000
+            tdSql.execute(f"create table {tbname} using {self.dbname}.{self.stable} tags({i} ,'nchar_{i}')")
+            tdLog.info(f"create table {tbname} using {self.dbname}.{self.stable} tags({i} ,'nchar_{i}')")
+            if i < (self.tb_nums - 2):
+                for row in range(row_nums):
+                    ts = self.ts + row*1000
+                    tdSql.execute(f"insert into {tbname} values({ts} , {row/10}, {215 + (row % 100)})")
+
+                for null in range(5):
+                    ts =  self.ts + row_nums*1000 + null*1000
+                    tdSql.execute(f"insert into {tbname} values({ts} , NULL , NULL)")
+
+    def basic_query(self):
+        tdSql.query(f"select groupid, count(*) from {self.dbname}.{self.stable} partition by groupid interval(1d) limit 100")
+        tdSql.checkRows(8)
+        tdSql.checkData(0, 1, 1005)
+        
+        tdSql.query(f"select groupid, count(*) from {self.dbname}.{self.stable} partition by tbname interval(1d) order by groupid limit 100;")
+        tdSql.checkRows(8)
+        tdSql.checkData(0, 0, 0)   
+        tdSql.checkData(0, 1, 1005)   
+        tdSql.checkData(7, 0, 7)  
+        tdSql.checkData(7, 1, 1005)  
+        
+        tdSql.query(f"select groupid, count(*) from {self.dbname}.{self.stable} partition by tbname, groupid interval(5d) order by groupid limit 10")
+        tdSql.checkRows(8)
+        tdSql.checkData(0, 0, 0)   
+        tdSql.checkData(0, 1, 1005)   
+        tdSql.checkData(7, 0, 7)  
+        tdSql.checkData(7, 1, 1005)
+        
+        tdSql.query(f"select groupid, count(*), min(current) from {self.dbname}.{self.stable} partition by groupid interval(5d) order  by groupid limit 10;")
+        tdSql.checkRows(8)
+        tdSql.checkData(0, 0, 0)   
+        tdSql.checkData(0, 1, 1005)
+        tdSql.checkData(0, 2, 0)  
+        tdSql.checkData(7, 0, 7)  
+        tdSql.checkData(7, 1, 1005)
+        tdSql.checkData(7, 2, 0)
+        
+        tdSql.query(f"select groupid, min(current) from {self.dbname}.{self.stable} partition by groupid interval(5d) limit 100;")
+        tdSql.checkRows(8)
+        tdSql.checkData(0, 1, 0)
+        
+        tdSql.query(f"select groupid, avg(current) from {self.dbname}.{self.stable} partition by groupid interval(5d) limit 10000;")
+        tdSql.checkRows(8)
+        tdSql.checkData(0, 1, tdSql.getData(7, 1))
+
+        tdSql.query(f"select current, avg(current) from {self.dbname}.{self.stable} partition by current interval(5d) limit 100;")
+        tdSql.checkData(0, 0, tdSql.getData(0, 1)) 
+        
+        tdSql.query(f"select groupid, last(voltage), min(current) from {self.dbname}.{self.stable} partition by groupid interval(5d) limit 10")
+        tdSql.checkRows(8)
+        tdSql.checkData(0, 1, tdSql.getData(7, 1))
+        tdSql.checkData(0, 2, tdSql.getData(7, 2))
+        
+        tdSql.query(f"select groupid, min(current), min(voltage) from {self.dbname}.{self.stable} partition by tbname, groupid interval(5d) limit 100;")
+        tdSql.checkRows(8)
+        tdSql.checkData(0, 1, 0)   
+        tdSql.checkData(0, 2, 215)   
+        tdSql.checkData(7, 1, 0)  
+        tdSql.checkData(7, 2, 215)
+        
+        tdSql.query(f"select groupid, min(voltage), min(current) from {self.dbname}.{self.stable} partition by tbname, groupid interval(5d) limit 100;")
+        tdSql.checkRows(8)
+        tdSql.checkData(0, 2, 0)   
+        tdSql.checkData(0, 1, 215)   
+        tdSql.checkData(7, 2, 0)  
+        tdSql.checkData(7, 1, 215)           
+        
+    def run(self):
+        tdSql.prepare()
+        self.prepare_datas("stb",self.tb_nums,self.row_nums)
+        self.basic_query()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/runAllOne.sh b/tests/system-test/runAllOne.sh
index 099ae1bbd3..79fc2cd363 100644
--- a/tests/system-test/runAllOne.sh
+++ b/tests/system-test/runAllOne.sh
@@ -235,6 +235,8 @@ python3 ./test.py -f 2-query/mavg.py -P
 python3 ./test.py -f 2-query/mavg.py -P -R
 python3 ./test.py -f 2-query/max_partition.py -P
 python3 ./test.py -f 2-query/max_partition.py -P -R
+python3 ./test.py -f 2-query/partition_limit_interval.py -P
+python3 ./test.py -f 2-query/partition_limit_interval.py -P -R
 python3 ./test.py -f 2-query/max_min_last_interval.py -P
 python3 ./test.py -f 2-query/last_row_interval.py -P
 python3 ./test.py -f 2-query/max.py -P
@@ -481,6 +483,7 @@ python3 ./test.py -f 2-query/irate.py -P -Q 2
 python3 ./test.py -f 2-query/function_null.py -P -Q 2
 python3 ./test.py -f 2-query/count_partition.py -P -Q 2
 python3 ./test.py -f 2-query/max_partition.py -P -Q 2
+python3 ./test.py -f 2-query/partition_limit_interval.py -P -Q 2
 python3 ./test.py -f 2-query/max_min_last_interval.py -P -Q 2
 python3 ./test.py -f 2-query/last_row_interval.py -P -Q 2
 python3 ./test.py -f 2-query/last_row.py -P -Q 2
@@ -576,6 +579,7 @@ python3 ./test.py -f 2-query/irate.py -P -Q 3
 python3 ./test.py -f 2-query/function_null.py -P -Q 3
 python3 ./test.py -f 2-query/count_partition.py -P -Q 3
 python3 ./test.py -f 2-query/max_partition.py -P -Q 3
+python3 ./test.py -f 2-query/partition_limit_interval.py -P -Q 3
 python3 ./test.py -f 2-query/max_min_last_interval.py -P -Q 3
 python3 ./test.py -f 2-query/last_row_interval.py -P -Q 3
 python3 ./test.py -f 2-query/last_row.py -P -Q 3
@@ -673,6 +677,7 @@ python3 ./test.py -f 2-query/irate.py -P -Q 4
 python3 ./test.py -f 2-query/function_null.py -P -Q 4
 python3 ./test.py -f 2-query/count_partition.py -P -Q 4
 python3 ./test.py -f 2-query/max_partition.py -P -Q 4
+python3 ./test.py -f 2-query/partition_limit_interval.py -P -Q 4
 python3 ./test.py -f 2-query/max_min_last_interval.py -P -Q 4
 python3 ./test.py -f 2-query/last_row_interval.py -P -Q 4
 python3 ./test.py -f 2-query/last_row.py -P -Q 4