diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/template_mbed_app.txt b/connectivity/netsocket/tests/TESTS/network/wifi/template_mbed_app.txt
index 1a7a8619c9..482143c635 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/template_mbed_app.txt
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/template_mbed_app.txt
@@ -28,14 +28,6 @@
             "help": "Channel number of unsecure SSID (if set_channel() is supported)",
             "value": 2
         },
-        "ap-mac-secure": {
-            "help": "BSSID of secure AP in form of AA:BB:CC:DD:EE:FF",
-            "value": "\"AA:AA:AA:AA:AA:AA\""
-        },
-        "ap-mac-unsecure": {
-            "help": "BSSID of unsecure AP in form of \"AA:BB:CC:DD:EE:FF\"",
-            "value": "\"BB:BB:BB:BB:BB:BB\""
-        },
         "max-scan-size": {
             "help": "How many networks may appear in Wifi scan result (default is 10)",
             "value": 10
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp
index 4f8e53ed5c..de24fa5313 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp
@@ -34,8 +34,10 @@ void wifi_connect_disconnect_repeat(void)
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
 
     for (int i = 0; i < 10; i++) {
+        printf("#%u connecting...\n", i);
         error = wifi->connect();
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
+        printf("#%u diconnecting...\n", i);
         error = wifi->disconnect();
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
     }
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure_fail.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure_fail.cpp
index 47898de809..72da4c0340 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure_fail.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure_fail.cpp
@@ -31,7 +31,9 @@ void wifi_connect_secure_fail(void)
 
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, "aaaaaaaa", get_security()));
     nsapi_error_t error;
+    printf("Wifi connection with wrong password\n");
     error = wifi->connect();
+    printf("=> %d => Wifi disconnection\n", error);
     wifi->disconnect();
     TEST_ASSERT(error == NSAPI_ERROR_AUTH_FAILURE ||
                 error == NSAPI_ERROR_CONNECTION_TIMEOUT ||
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp
index 202a33181c..cfa86355b6 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp
@@ -31,21 +31,17 @@ void wifi_scan(void)
     WiFiAccessPoint ap[MBED_CONF_APP_MAX_SCAN_SIZE];
 
     int size = wifi->scan(ap, MBED_CONF_APP_MAX_SCAN_SIZE);
+    printf("Scanned %u AP\n", size);
     TEST_ASSERT(size >= 1);
 
     bool secure_found = false;
     bool unsecure_found = false;
 
-    char secure_bssid[6];
-    char unsecure_bssid[6];
-    const char *coversion_string = "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx";
-    TEST_ASSERT_EQUAL_INT_MESSAGE(6, sscanf(MBED_CONF_APP_AP_MAC_SECURE, coversion_string, &secure_bssid[0], &secure_bssid[1], &secure_bssid[2], &secure_bssid[3], &secure_bssid[4], &secure_bssid[5]), "Failed to convert ap-mac-secure from mbed_app.json");
-    TEST_ASSERT_EQUAL_INT_MESSAGE(6, sscanf(MBED_CONF_APP_AP_MAC_UNSECURE, coversion_string, &unsecure_bssid[0], &unsecure_bssid[1], &unsecure_bssid[2], &unsecure_bssid[3], &unsecure_bssid[4], &unsecure_bssid[5]), "Failed to convert ap-mac-unsecure from mbed_app.json");
-
     for (int i = 0; i < size; i++) {
         const char *ssid = ap[i].get_ssid();
         nsapi_security_t security = ap[i].get_security();
         int8_t rssi = ap[i].get_rssi();
+        printf("AP %u ssid %s security %u rssi %d\n", i, ssid, security, rssi);
         TEST_ASSERT_INT8_WITHIN(-10, -100, rssi);
 #if defined(MBED_CONF_APP_WIFI_SECURE_SSID)
         if (strcmp(MBED_CONF_APP_WIFI_SECURE_SSID, ssid) == 0) {