diff --git a/TESTS/network/wifi/wifi_connect_nocredentials.cpp b/TESTS/network/wifi/wifi_connect_nocredentials.cpp
index 5e3026623c..2fe2b16261 100644
--- a/TESTS/network/wifi/wifi_connect_nocredentials.cpp
+++ b/TESTS/network/wifi/wifi_connect_nocredentials.cpp
@@ -26,7 +26,9 @@ using namespace utest::v1;
 void wifi_connect_nocredentials(void)
 {
     WiFiInterface *wifi = get_interface();
-    nsapi_error_t error;
-    error = wifi->connect();
-    TEST_ASSERT(error == NSAPI_ERROR_NO_SSID || error == NSAPI_ERROR_PARAMETER);
+    nsapi_error_t error_connect, error_disconnect;
+    error_connect = wifi->connect();
+    error_disconnect = wifi->disconnect();
+    TEST_ASSERT(error_connect == NSAPI_ERROR_NO_SSID || error_connect == NSAPI_ERROR_PARAMETER);
+    TEST_ASSERT(error_disconnect == NSAPI_ERROR_NO_CONNECTION);
 }
diff --git a/TESTS/network/wifi/wifi_connect_params_channel.cpp b/TESTS/network/wifi/wifi_connect_params_channel.cpp
index 42e1961a88..a7fb57c4c6 100644
--- a/TESTS/network/wifi/wifi_connect_params_channel.cpp
+++ b/TESTS/network/wifi/wifi_connect_params_channel.cpp
@@ -35,9 +35,12 @@ void wifi_connect_params_channel(void)
     }
 
     nsapi_error_t error = wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, get_security(), MBED_CONF_APP_WIFI_CH_SECURE);
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
 
     wifi->set_channel(0);
+
+    wifi->disconnect();
+
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
 }
 
 #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 f1a44ee33d..30f82a891c 100644
--- a/TESTS/network/wifi/wifi_connect_params_null.cpp
+++ b/TESTS/network/wifi/wifi_connect_params_null.cpp
@@ -25,7 +25,12 @@ using namespace utest::v1;
 
 void wifi_connect_params_null(void)
 {
+    nsapi_error_t error;
     WiFiInterface *wifi = get_interface();
-    TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_PARAMETER, wifi->connect(NULL, NULL));
-    TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_PARAMETER, wifi->connect("", ""));
+    error = wifi->connect(NULL, NULL);
+    wifi->disconnect();
+    TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
+    error =  wifi->connect("", "");   
+    wifi->disconnect();
+    TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
 }
diff --git a/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp b/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
index eca57ef202..359d3c5f0d 100644
--- a/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
+++ b/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
@@ -30,6 +30,7 @@ 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, get_security()) == NSAPI_ERROR_OK) {
+        wifi->disconnect();
         return;
     }
 
diff --git a/TESTS/network/wifi/wifi_connect_secure.cpp b/TESTS/network/wifi/wifi_connect_secure.cpp
index 5f0cfba64d..6a2e8e36fe 100644
--- a/TESTS/network/wifi/wifi_connect_secure.cpp
+++ b/TESTS/network/wifi/wifi_connect_secure.cpp
@@ -32,6 +32,8 @@ 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, get_security()));
 
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
+    
+    TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->disconnect());
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)
diff --git a/TESTS/network/wifi/wifi_connect_secure_fail.cpp b/TESTS/network/wifi/wifi_connect_secure_fail.cpp
index e171e2f678..47898de809 100644
--- a/TESTS/network/wifi/wifi_connect_secure_fail.cpp
+++ b/TESTS/network/wifi/wifi_connect_secure_fail.cpp
@@ -32,9 +32,11 @@ 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;
     error = wifi->connect();
+    wifi->disconnect();
     TEST_ASSERT(error == NSAPI_ERROR_AUTH_FAILURE ||
                 error == NSAPI_ERROR_CONNECTION_TIMEOUT ||
                 error == NSAPI_ERROR_NO_CONNECTION);
+
 }
 
 #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..71ed26e32f 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());
+
+    TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->disconnect());
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)