diff --git a/connectivity/netsocket/tests/TESTS/netsocket/dns/main.cpp b/connectivity/netsocket/tests/TESTS/netsocket/dns/main.cpp
index 01e35d4..d9723f4 100644
--- a/connectivity/netsocket/tests/TESTS/netsocket/dns/main.cpp
+++ b/connectivity/netsocket/tests/TESTS/netsocket/dns/main.cpp
@@ -168,6 +168,7 @@
     MBED_ASSERT(MBED_CONF_APP_DNS_TEST_HOSTS_NUM >= MBED_CONF_NSAPI_DNS_CACHE_SIZE && MBED_CONF_APP_DNS_TEST_HOSTS_NUM >= MBED_CONF_APP_DNS_SIMULT_QUERIES + 1);
 
     net = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     SocketAddress address;
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/tcp/main.cpp b/connectivity/netsocket/tests/TESTS/netsocket/tcp/main.cpp
index f2be5b8..0dde5a9 100644
--- a/connectivity/netsocket/tests/TESTS/netsocket/tcp/main.cpp
+++ b/connectivity/netsocket/tests/TESTS/netsocket/tcp/main.cpp
@@ -75,6 +75,7 @@
 static void _ifup()
 {
     NetworkInterface *net = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     SocketAddress address;
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/tls/main.cpp b/connectivity/netsocket/tests/TESTS/netsocket/tls/main.cpp
index f6489a3..aa256a7 100644
--- a/connectivity/netsocket/tests/TESTS/netsocket/tls/main.cpp
+++ b/connectivity/netsocket/tests/TESTS/netsocket/tls/main.cpp
@@ -71,6 +71,7 @@
 static void _ifup()
 {
     NetworkInterface *net = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     SocketAddress address;
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/udp/main.cpp b/connectivity/netsocket/tests/TESTS/netsocket/udp/main.cpp
index b3bfa89..4b88b60 100644
--- a/connectivity/netsocket/tests/TESTS/netsocket/udp/main.cpp
+++ b/connectivity/netsocket/tests/TESTS/netsocket/udp/main.cpp
@@ -62,6 +62,7 @@
 static void _ifup()
 {
     NetworkInterface *net = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     SocketAddress address;
diff --git a/connectivity/netsocket/tests/TESTS/network/interface/networkinterface_status.cpp b/connectivity/netsocket/tests/TESTS/network/interface/networkinterface_status.cpp
index 8ed5698..ce95d08 100644
--- a/connectivity/netsocket/tests/TESTS/network/interface/networkinterface_status.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/interface/networkinterface_status.cpp
@@ -75,6 +75,7 @@
     current_status = NSAPI_STATUS_ERROR_UNSUPPORTED;
 
     net = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");
     net->attach(status_cb);
     net->set_blocking(true);
 
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect.cpp
index aec259f..fbd6f59 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect.cpp
@@ -30,6 +30,10 @@
 void wifi_connect(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     char ssid[SSID_MAX_LEN + 1] = MBED_CONF_APP_WIFI_UNSECURE_SSID;
 
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 de24fa5..898233d 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
@@ -28,6 +28,10 @@
 void wifi_connect_disconnect_repeat(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
     nsapi_error_t error;
 
     error = wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, get_security());
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_nocredentials.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_nocredentials.cpp
index 73e8c01..bae1a6e 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_nocredentials.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_nocredentials.cpp
@@ -26,6 +26,10 @@
 void wifi_connect_nocredentials(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
     nsapi_error_t error_connect, error_disconnect;
     error_connect = wifi->connect();
     error_disconnect = wifi->disconnect();
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel.cpp
index a7fb57c..6be5b7d 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel.cpp
@@ -28,6 +28,10 @@
 void wifi_connect_params_channel(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     if (wifi->set_channel(1) == NSAPI_ERROR_UNSUPPORTED && wifi->set_channel(36) == NSAPI_ERROR_UNSUPPORTED) {
         TEST_IGNORE_MESSAGE("set_channel() not supported");
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel_fail.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel_fail.cpp
index 40b2bc9..fc27f34 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel_fail.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel_fail.cpp
@@ -28,6 +28,10 @@
 void wifi_connect_params_channel_fail(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     if (wifi->set_channel(1) == NSAPI_ERROR_UNSUPPORTED && wifi->set_channel(36) == NSAPI_ERROR_UNSUPPORTED) {
         TEST_IGNORE_MESSAGE("set_channel() not supported");
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_null.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_null.cpp
index 0c2350d..8fbe4be 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_null.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_null.cpp
@@ -27,6 +27,10 @@
 {
     nsapi_error_t error;
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
     error = wifi->connect(NULL, NULL);
     wifi->disconnect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
index 2b3f1e9..3264d90 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
@@ -28,6 +28,10 @@
 void wifi_connect_params_valid_secure(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     if (wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, get_security()) == NSAPI_ERROR_OK) {
         if (wifi->disconnect() == NSAPI_ERROR_OK) {
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure.cpp
index ee3059f..82f8e51 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure.cpp
@@ -28,6 +28,10 @@
 void wifi_connect_secure(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     // Driver shall cache the credentials
     char ssid[] = MBED_CONF_APP_WIFI_SECURE_SSID;
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 72da4c0..44d2793 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
@@ -28,6 +28,10 @@
 void wifi_connect_secure_fail(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, "aaaaaaaa", get_security()));
     nsapi_error_t error;
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_get_rssi.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_get_rssi.cpp
index 3cf5ab1..d6400a6 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_get_rssi.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_get_rssi.cpp
@@ -28,6 +28,10 @@
 void wifi_get_rssi(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, get_security()));
 
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp
index cfa8635..1ae8e13 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp
@@ -27,6 +27,10 @@
 void wifi_scan(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     WiFiAccessPoint ap[MBED_CONF_APP_MAX_SCAN_SIZE];
 
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan_null.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan_null.cpp
index 4675148..fc862e2 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan_null.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan_null.cpp
@@ -26,5 +26,9 @@
 void wifi_scan_null(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
     TEST_ASSERT(wifi->scan(NULL, 0) >= 1);
 }
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_channel.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_channel.cpp
index 09eaa23..cddd90a 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_channel.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_channel.cpp
@@ -30,6 +30,10 @@
     bool is_5Ghz = false;
 
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     if (wifi->set_channel(1) == NSAPI_ERROR_UNSUPPORTED && wifi->set_channel(36) == NSAPI_ERROR_UNSUPPORTED) {
         TEST_IGNORE_MESSAGE("set_channel() not supported");
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_credential.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_credential.cpp
index b21e8f9..f7aae23 100644
--- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_credential.cpp
+++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_credential.cpp
@@ -26,6 +26,10 @@
 void wifi_set_credential(void)
 {
     WiFiInterface *iface = get_interface();
+    TEST_ASSERT(iface);
+    if (iface == NULL) {
+        return;
+    }
     nsapi_error_t error;
 
     error = iface->set_credentials(NULL, NULL, NSAPI_SECURITY_NONE);