diff --git a/tests/pytest/query/queryGroupbySort.py b/tests/pytest/query/queryGroupbySort.py
index 80f6d55aae1ae79cafbe651cc99db1d301dd90fc..c2649a86db8dcd399d7cddf2d752d1ac0b898abb 100644
--- a/tests/pytest/query/queryGroupbySort.py
+++ b/tests/pytest/query/queryGroupbySort.py
@@ -45,6 +45,10 @@ class TDTestCase:
         tdSql.checkData(0, 0, "2018-10-03 14:38:05")
         tdSql.checkData(1, 0, "2018-10-03 14:38:15")
         tdSql.checkData(2, 0, "2018-10-03 14:38:16")
+
+        tdSql.error("SELECT SUM(current) as s, AVG(voltage) FROM meters WHERE groupId > 1 INTERVAL(1s) GROUP BY location order by s ASC")
+
+        tdSql.error("SELECT SUM(current) as s, AVG(voltage) FROM meters WHERE groupId > 1 INTERVAL(1s) GROUP BY location order by s DESC")
         
     def stop(self):
         tdSql.close()
diff --git a/tests/pytest/tools/taosdemoTest2.py b/tests/pytest/tools/taosdemoTest2.py
index 4d7e871e66b87c4c3ff8c46f68f00426d117d956..1e492aa8fca30fa6a9081ed023162828c01ca3db 100644
--- a/tests/pytest/tools/taosdemoTest2.py
+++ b/tests/pytest/tools/taosdemoTest2.py
@@ -33,13 +33,23 @@ class TDTestCase:
         if(threadID == 0):
             os.system("yes | taosdemo -t %d -n %d -x" % (self.numberOfTables, self.numberOfRecords))
         if(threadID == 1):
+            time.sleep(2)
             print("use test")
-            tdSql.execute("use test")
+            tdSql.execute("use test")            
+            # check if all the tables have heen created
+            while True:
+                tdSql.query("show tables")
+                rows = tdSql.queryRows
+                print("number of tables: %d" % rows)
+                if(rows == self.numberOfTables):
+                    break
+                time.sleep(1)
+            # check if there are any records in the last created table
             while True:
                 print("query started")
                 tdSql.query("select * from test.t9")
                 rows = tdSql.queryRows
-                print("rows %d" % rows)
+                print("number of records: %d" % rows)
                 if(rows > 0):
                     break
                 time.sleep(1)      
@@ -54,8 +64,7 @@ class TDTestCase:
         t1 = threading.Thread(target=self.insertDataAndAlterTable, args=(0, ))
         t2 = threading.Thread(target=self.insertDataAndAlterTable, args=(1, ))
 
-        t1.start() 
-        time.sleep(2)     
+        t1.start()        
         t2.start()
         t1.join()
         t2.join()