diff --git a/tests/multi_bluetooth/ble_characteristic.py b/tests/multi_bluetooth/ble_characteristic.py
index 0d72c181f..d918d9aef 100644
--- a/tests/multi_bluetooth/ble_characteristic.py
+++ b/tests/multi_bluetooth/ble_characteristic.py
@@ -146,7 +146,7 @@ def instance1():
     try:
         # Connect to peripheral and then disconnect.
         print("gap_connect")
-        ble.gap_connect(0, BDADDR)
+        ble.gap_connect(*BDADDR)
         if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         conn_handle, _, _ = waiting_data
diff --git a/tests/multi_bluetooth/ble_gap_advertise.py b/tests/multi_bluetooth/ble_gap_advertise.py
index 71a5b58a5..bb6ff8e42 100644
--- a/tests/multi_bluetooth/ble_gap_advertise.py
+++ b/tests/multi_bluetooth/ble_gap_advertise.py
@@ -36,7 +36,7 @@ def instance1():
     def irq(ev, data):
         nonlocal finished, adv_types, adv_data
         if ev == _IRQ_SCAN_RESULT:
-            if data[1] == BDADDR:
+            if data[0] == BDADDR[0] and data[1] == BDADDR[1]:
                 adv_types.add(data[2])
                 if adv_data is None:
                     adv_data = bytes(data[4])
diff --git a/tests/multi_bluetooth/ble_gap_connect.py b/tests/multi_bluetooth/ble_gap_connect.py
index 8e3ed8b81..ba9c28230 100644
--- a/tests/multi_bluetooth/ble_gap_connect.py
+++ b/tests/multi_bluetooth/ble_gap_connect.py
@@ -76,7 +76,7 @@ def instance1():
     try:
         # Connect to peripheral and then disconnect.
         print("gap_connect")
-        ble.gap_connect(0, BDADDR)
+        ble.gap_connect(*BDADDR)
         if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         print("gap_disconnect:", ble.gap_disconnect(waiting_data[0]))
@@ -88,7 +88,7 @@ def instance1():
 
         # Connect to peripheral and then let the peripheral disconnect us.
         print("gap_connect")
-        ble.gap_connect(0, BDADDR)
+        ble.gap_connect(*BDADDR)
         if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
diff --git a/tests/multi_bluetooth/ble_gap_device_name.py b/tests/multi_bluetooth/ble_gap_device_name.py
index dafa36712..92ea94278 100644
--- a/tests/multi_bluetooth/ble_gap_device_name.py
+++ b/tests/multi_bluetooth/ble_gap_device_name.py
@@ -97,7 +97,7 @@ def instance1():
 
             # Connect to peripheral.
             print("gap_connect")
-            ble.gap_connect(0, BDADDR)
+            ble.gap_connect(*BDADDR)
             if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
                 return
             conn_handle, _, _ = waiting_data
diff --git a/tests/multi_bluetooth/ble_gatt_data_transfer.py b/tests/multi_bluetooth/ble_gatt_data_transfer.py
index dba0c333b..240f04860 100644
--- a/tests/multi_bluetooth/ble_gatt_data_transfer.py
+++ b/tests/multi_bluetooth/ble_gatt_data_transfer.py
@@ -137,7 +137,7 @@ def instance1():
     try:
         # Connect to peripheral and then disconnect.
         print("gap_connect")
-        ble.gap_connect(0, BDADDR)
+        ble.gap_connect(*BDADDR)
         if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         conn_handle, _, _ = waiting_data
diff --git a/tests/multi_bluetooth/ble_gattc_discover_services.py b/tests/multi_bluetooth/ble_gattc_discover_services.py
index e746b8745..57f95bf01 100644
--- a/tests/multi_bluetooth/ble_gattc_discover_services.py
+++ b/tests/multi_bluetooth/ble_gattc_discover_services.py
@@ -85,7 +85,7 @@ def instance1():
     try:
         # Connect to peripheral and then disconnect.
         print("gap_connect")
-        ble.gap_connect(0, BDADDR)
+        ble.gap_connect(*BDADDR)
         if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         conn_handle, _, _ = waiting_data