diff --git a/examples/openthread/ot_ci_function.py b/examples/openthread/ot_ci_function.py
index 86aac2fd061..d3092a05207 100644
--- a/examples/openthread/ot_ci_function.py
+++ b/examples/openthread/ot_ci_function.py
@@ -140,11 +140,15 @@ def joinThreadNetwork(dut: IdfDut, thread: thread_parameter) -> None:
 
 
 def wait_for_join(dut: IdfDut, role: str) -> bool:
+    clean_buffer(dut)
     for _ in range(1, 30):
-        if getDeviceRole(dut) == role:
-            wait(dut, 5)
+        time.sleep(1)
+        execute_command(dut, 'state')
+        try:
+            dut.expect(re.compile(role), timeout=5)
             return True
-        wait(dut, 1)
+        except Exception:
+            continue
     return False
 
 
diff --git a/examples/openthread/pytest_otbr.py b/examples/openthread/pytest_otbr.py
index 2847e7c89c2..7df10a94789 100644
--- a/examples/openthread/pytest_otbr.py
+++ b/examples/openthread/pytest_otbr.py
@@ -231,7 +231,11 @@ def test_Bidirectional_IPv6_connectivity(Init_interface:bool, dut: Tuple[IdfDut,
         out_bytes = subprocess.check_output(command, shell=True, timeout=5)
         out_str = out_bytes.decode('utf-8')
         onlinkprefix = ocf.get_onlinkprefix(br)
-        host_global_unicast_addr = re.findall(r'\W+(%s(?:\w+:){3}\w+)\W+' % onlinkprefix, str(out_str))
+        pattern = rf'\W+({onlinkprefix}(?:\w+:){{3}}\w+)\W+'
+        host_global_unicast_addr = re.findall(pattern, out_str)
+        print(f'host_global_unicast_addr: {host_global_unicast_addr}')
+        if host_global_unicast_addr is None:
+            raise Exception(f'onlinkprefix: {onlinkprefix}, host_global_unicast_addr: {host_global_unicast_addr}')
         rx_nums = 0
         for ip_addr in host_global_unicast_addr:
             txrx_nums = ocf.ot_ping(cli, str(ip_addr), count=10)