diff --git a/tests/pytest/cluster/clusterSetup.py b/tests/pytest/cluster/clusterSetup.py
index 36af8ac42e56e1b8a7ab2237305a6bf286103552..dbda5657b6528402cc898762cccc78d74a196cd8 100644
--- a/tests/pytest/cluster/clusterSetup.py
+++ b/tests/pytest/cluster/clusterSetup.py
@@ -31,6 +31,23 @@ class Node:
         self.homeDir = homeDir
         self.conn = Connection("{}@{}".format(username, hostName), connect_kwargs={"password": "{}".format(password)}) 
     
+    def buildTaosd(self):
+        try:
+            self.conn.cd("/root/TDinternal/community")
+            self.conn.run("git checkout develop")
+            self.conn.run("git pull")
+            self.conn.cd("/root/TDinternal")
+            self.conn.run("git checkout develop")
+            self.conn.run("git pull")
+            self.conn.cd("/root/TDinternal/debug")
+            self.conn.run("cmake ..")
+            self.conn.run("make")
+            self.conn.run("make install")
+        except Exception as e:
+            print("Build Taosd error for node %d " % self.index)
+            logging.exception(e)
+            pass
+
     def startTaosd(self):
         try:
             self.conn.run("sudo systemctl start taosd")
@@ -50,7 +67,7 @@ class Node:
             self.conn.run("sudo systemctl restart taosd")
         except Exception as e:
             print("Stop Taosd error for node %d " % self.index)
-            logging.exception(e)
+            logging.exception(e)    
 
     def removeTaosd(self):
         try:
@@ -105,9 +122,11 @@ class Node:
 
 class Nodes:
     def __init__(self):
-        self.node1 = Node(1, 'ubuntu', '192.168.1.52', 'node1', 'tbase125!', '/home/ubuntu')
-        self.node2 = Node(2, 'ubuntu', '192.168.1.53', 'node2', 'tbase125!', '/home/ubuntu')
-        self.node3 = Node(3, 'ubuntu', '192.168.1.54', 'node3', 'tbase125!', '/home/ubuntu')
+        self.node1 = Node(1, 'root', '52.151.60.239', 'node1', 'r', '/root/')
+        self.node2 = Node(2, 'root', '52.183.32.246', 'node1', 'r', '/root/')
+        self.node3 = Node(3, 'root', '51.143.46.79', 'node1', 'r', '/root/')
+        self.node4 = Node(4, 'root', '52.183.2.76', 'node1', 'r', '/root/')
+        self.node5 = Node(5, 'root', '13.66.225.87', 'node1', 'r', '/root/')        
 
     def stopAllTaosd(self):
         self.node1.stopTaosd()
diff --git a/tests/pytest/query/queryJoin.py b/tests/pytest/query/queryJoin.py
index 5ad49a265ea52279f7934476a4a1db2fbbdf5883..57b7e8868d711878b274644a782bd4c320351049 100644
--- a/tests/pytest/query/queryJoin.py
+++ b/tests/pytest/query/queryJoin.py
@@ -141,6 +141,40 @@ class TDTestCase:
         tdSql.query("select * from meters1, meters3 where meters1.ts = meters3.ts and meters1.tag1 = meters3.tag1")
         tdSql.checkRows(0)
 
+        tdSql.execute("create table join_mt0(ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) tags(t1 int, t2 binary(12))")
+        tdSql.execute("create table join_mt1(ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) tags(t1 int, t2 binary(12), t3 int)")
+
+        ts = 1538548685000
+        for i in range(3):
+            tdSql.execute("create table join_tb%d using join_mt0 tags(%d, 'abc')" % (i, i)) 
+            sql = "insert into join_tb%d values" % i
+            for j in range(500):
+                val = j % 100
+                sql += "(%d, %d, %f, %d, %d, %d, %f, %d, 'binary%d', 'nchar%d')" % (ts + j, val, val * 1.0, val, val, val, val * 1.0, val % 2,  val, val)
+            tdSql.execute(sql)
+            sql = "insert into join_tb%d values" % i
+            for j in range(500, 1000):
+                val = j % 100
+                sql += "(%d, %d, %f, %d, %d, %d, %f, %d, 'binary%d', 'nchar%d')" % (ts + 500 + j, val, val * 1.0, val, val, val, val * 1.0, val % 2,  val, val)
+            tdSql.execute(sql)
+        
+        for i in range(3):
+            tdSql.execute("create table join_1_tb%d using join_mt1 tags(%d, 'abc%d', %d)" % (i, i, i, i))            
+            sql = "insert into join_1_tb%d values" % i
+            for j in range(500):
+                val = j % 100
+                sql += "(%d, %d, %f, %d, %d, %d, %f, %d, 'binary%d', 'nchar%d')" % (ts + j, val, val * 1.0, val, val, val, val * 1.0, val % 2,  val, val)
+            tdSql.execute(sql)
+            sql = "insert into join_1_tb%d values" % i
+            for j in range(500, 1000):
+                val = j % 100
+                sql += "(%d, %d, %f, %d, %d, %d, %f, %d, 'binary%d', 'nchar%d')" % (ts + 500 + j, val, val * 1.0, val, val, val, val * 1.0, val % 2,  val, val)
+            tdSql.execute(sql)
+
+        tdSql.error("select count(join_mt0.c1), sum(join_mt1.c2), first(join_mt0.c5), last(join_mt1.c7) from join_mt0, join_mt1 where join_mt0.t1=join_mt1.t1 and join_mt0.ts=join_mt1.ts interval(10a) group by join_mt0.t1 order by join_mt0.ts desc")
+        tdSql.error("select count(join_mt0.c1), first(join_mt0.c1)-first(join_mt1.c1), first(join_mt1.c9) from join_mt0, join_mt1 where join_mt0.t1=join_mt1.t1 and join_mt0.ts=join_mt1.ts")
+        tdSql.error("select count(join_mt0.c1), first(join_mt0.c1), first(join_mt1.c9) from join_mt0, join_mt1 where join_mt0.t1=join_mt1.t1 and join_mt0.ts=join_mt1.ts interval(10a) group by join_mt0.t1, join_mt0.t2 order by join_mt0.t1 desc slimit 3")
+        tdSql.error("select count(join_mt0.c1), first(join_mt0.c1) from join_mt0, join_mt1 where join_mt0.t1=join_mt1.t1 and join_mt0.ts=join_mt1.ts interval(10a) group by join_mt0.t1, join_mt0.t2, join_mt1.t1 order by join_mt0.ts desc, join_mt1.ts asc limit 10;")
 
     def stop(self):
         tdSql.close()