diff --git a/TESTS/network/wifi/wifi_connect.cpp b/TESTS/network/wifi/wifi_connect.cpp
index 6d27988838..8ca2a27c06 100644
--- a/TESTS/network/wifi/wifi_connect.cpp
+++ b/TESTS/network/wifi/wifi_connect.cpp
@@ -32,6 +32,7 @@ void wifi_connect(void)
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL));
 
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
+    wifi->disconnect();
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
diff --git a/TESTS/network/wifi/wifi_connect_nocredentials.cpp b/TESTS/network/wifi/wifi_connect_nocredentials.cpp
index c930d7d0a9..4c0a70f24e 100644
--- a/TESTS/network/wifi/wifi_connect_nocredentials.cpp
+++ b/TESTS/network/wifi/wifi_connect_nocredentials.cpp
@@ -29,5 +29,5 @@ void wifi_connect_nocredentials(void)
     nsapi_error_t error;
     error = wifi->connect();
     wifi->disconnect();
-    TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
+    TEST_ASSERT(error == NSAPI_ERROR_NO_SSID);
 }
diff --git a/TESTS/network/wifi/wifi_connect_params_channel.cpp b/TESTS/network/wifi/wifi_connect_params_channel.cpp
index 4289653976..828b17bb8b 100644
--- a/TESTS/network/wifi/wifi_connect_params_channel.cpp
+++ b/TESTS/network/wifi/wifi_connect_params_channel.cpp
@@ -36,6 +36,7 @@ void wifi_connect_params_channel(void)
 
     nsapi_error_t error = wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2, MBED_CONF_APP_WIFI_CH_SECURE);
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
+    wifi->disconnect();
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)
diff --git a/TESTS/network/wifi/wifi_connect_params_null.cpp b/TESTS/network/wifi/wifi_connect_params_null.cpp
index 6a471bd604..3f2b9584d8 100644
--- a/TESTS/network/wifi/wifi_connect_params_null.cpp
+++ b/TESTS/network/wifi/wifi_connect_params_null.cpp
@@ -27,4 +27,5 @@ void wifi_connect_params_null(void)
 {
     WiFiInterface *wifi = get_interface();
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_PARAMETER, wifi->connect(NULL, NULL));
+    wifi->disconnect();
 }
diff --git a/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp b/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
index 47d1df9cd8..c09b8fdd7c 100644
--- a/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
+++ b/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
@@ -30,18 +30,22 @@ void wifi_connect_params_valid_secure(void)
     WiFiInterface *wifi = get_interface();
 
     if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2) == NSAPI_ERROR_OK) {
+        wifi->disconnect();
         return;
     }
 
     if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2) == NSAPI_ERROR_OK) {
+        wifi->disconnect();
         return;
     }
 
     if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA) == NSAPI_ERROR_OK) {
+        wifi->disconnect();
         return;
     }
 
     if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WEP) == NSAPI_ERROR_OK) {
+        wifi->disconnect();
         return;
     }
 
diff --git a/TESTS/network/wifi/wifi_connect_params_valid_unsecure.cpp b/TESTS/network/wifi/wifi_connect_params_valid_unsecure.cpp
index 91d8f144ea..7f61ff519b 100644
--- a/TESTS/network/wifi/wifi_connect_params_valid_unsecure.cpp
+++ b/TESTS/network/wifi/wifi_connect_params_valid_unsecure.cpp
@@ -29,6 +29,7 @@ void wifi_connect_params_valid_unsecure(void)
 {
     WiFiInterface *wifi = get_interface();
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL));
+    wifi->disconnect();
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
diff --git a/TESTS/network/wifi/wifi_connect_secure.cpp b/TESTS/network/wifi/wifi_connect_secure.cpp
index ca12832b9a..1bf3f1426b 100644
--- a/TESTS/network/wifi/wifi_connect_secure.cpp
+++ b/TESTS/network/wifi/wifi_connect_secure.cpp
@@ -32,6 +32,7 @@ void wifi_connect_secure(void)
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2));
 
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
+    wifi->disconnect();
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)
diff --git a/TESTS/network/wifi/wifi_get_rssi.cpp b/TESTS/network/wifi/wifi_get_rssi.cpp
index d95e6386ff..485431d435 100644
--- a/TESTS/network/wifi/wifi_get_rssi.cpp
+++ b/TESTS/network/wifi/wifi_get_rssi.cpp
@@ -36,6 +36,8 @@ void wifi_get_rssi(void)
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
 
     TEST_ASSERT_INT8_WITHIN(-10, -100, wifi->get_rssi());
+
+    wifi->disconnect();
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)