diff --git a/components/esp_wifi/test_apps/wifi_function/main/test_wifi_country.c b/components/esp_wifi/test_apps/wifi_function/main/test_wifi_country.c
index 1cbb3a79e90..cd520fa96c3 100644
--- a/components/esp_wifi/test_apps/wifi_function/main/test_wifi_country.c
+++ b/components/esp_wifi/test_apps/wifi_function/main/test_wifi_country.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -8,6 +8,8 @@
 #include "esp_log.h"
 #include "test_utils.h"
 #include "unity_test_utils.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
 
 #define TAG "test_wifi"
 #define EMPH_STR(s) "****** "s" ******"
@@ -36,6 +38,8 @@ TEST_CASE("wifi set country code", "[wifi_init]")
 
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit"));
     TEST_ESP_OK(esp_wifi_deinit());
+    /* Let the idle task reclaim the deleted Wi-Fi task's stack and TCB before the leak check. */
+    vTaskDelay(pdMS_TO_TICKS(300));
 
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_init"));
     TEST_ESP_OK(esp_wifi_init(&cfg));
@@ -56,7 +60,8 @@ TEST_CASE("wifi set country code", "[wifi_init]")
 
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit"));
     TEST_ESP_OK(esp_wifi_deinit());
-    vTaskDelay(1);
+    /* Let the idle task reclaim the deleted Wi-Fi task's stack and TCB before the leak check. */
+    vTaskDelay(pdMS_TO_TICKS(300));
 
     ESP_LOGI(TAG, "test passed...");
 }
diff --git a/components/esp_wifi/test_apps/wifi_function/main/test_wifi_init.c b/components/esp_wifi/test_apps/wifi_function/main/test_wifi_init.c
index cb522f8875c..46e43bfef4f 100644
--- a/components/esp_wifi/test_apps/wifi_function/main/test_wifi_init.c
+++ b/components/esp_wifi/test_apps/wifi_function/main/test_wifi_init.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -60,7 +60,8 @@ static void wifi_driver_can_start_on_APP_CPU_task(void* arg)
     TEST_ESP_OK(esp_wifi_init(&cfg));
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit..."));
     TEST_ESP_OK(esp_wifi_deinit());
-    vTaskDelay(1);
+    /* Let the idle task reclaim the deleted Wi-Fi task's stack and TCB before the leak check. */
+    vTaskDelay(pdMS_TO_TICKS(300));
     ESP_LOGI(TAG, EMPH_STR("event_deinit"));
     TEST_ESP_OK(event_deinit());
     ESP_LOGI(TAG, "exit task...");
@@ -99,7 +100,8 @@ TEST_CASE("Calling esp_wifi_stop() with start", "[wifi_init]")
     TEST_ESP_OK(esp_wifi_stop());
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit"));
     TEST_ESP_OK(esp_wifi_deinit());
-    vTaskDelay(1);
+    /* Let the idle task reclaim the deleted Wi-Fi task's stack and TCB before the leak check. */
+    vTaskDelay(pdMS_TO_TICKS(300));
     ESP_LOGI(TAG, EMPH_STR("event_deinit"));
     TEST_ESP_OK(event_deinit());
     ESP_LOGI(TAG, "test passed...");
@@ -116,7 +118,8 @@ TEST_CASE("Calling esp_wifi_stop() without start", "[wifi_init]")
     TEST_ESP_OK(esp_wifi_stop());
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit"));
     TEST_ESP_OK(esp_wifi_deinit());
-    vTaskDelay(1);
+    /* Let the idle task reclaim the deleted Wi-Fi task's stack and TCB before the leak check. */
+    vTaskDelay(pdMS_TO_TICKS(300));
     ESP_LOGI(TAG, EMPH_STR("event_deinit"));
     TEST_ESP_OK(event_deinit());
     ESP_LOGI(TAG, "test passed...");
@@ -137,7 +140,8 @@ TEST_CASE("Calling esp_wifi_deinit() without stop", "[wifi_init]")
     TEST_ESP_OK(esp_wifi_stop());
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit"));
     TEST_ESP_OK(esp_wifi_deinit());
-    vTaskDelay(1);
+    /* Let the idle task reclaim the deleted Wi-Fi task's stack and TCB before the leak check. */
+    vTaskDelay(pdMS_TO_TICKS(300));
     ESP_LOGI(TAG, EMPH_STR("event_deinit"));
     TEST_ESP_OK(event_deinit());
     ESP_LOGI(TAG, "test passed...");
@@ -154,7 +158,8 @@ TEST_CASE("Calling esp_wifi_connect() without start", "[wifi_init]")
     TEST_ESP_ERR(ESP_ERR_WIFI_NOT_STARTED, esp_wifi_connect());
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit"));
     TEST_ESP_OK(esp_wifi_deinit());
-    vTaskDelay(1);
+    /* Let the idle task reclaim the deleted Wi-Fi task's stack and TCB before the leak check. */
+    vTaskDelay(pdMS_TO_TICKS(300));
     ESP_LOGI(TAG, EMPH_STR("event_deinit"));
     TEST_ESP_OK(event_deinit());
     ESP_LOGI(TAG, "test passed...");
diff --git a/components/wpa_supplicant/test_apps/main/test_eloop.c b/components/wpa_supplicant/test_apps/main/test_eloop.c
index bd68e804f46..adec8ac2bc5 100644
--- a/components/wpa_supplicant/test_apps/main/test_eloop.c
+++ b/components/wpa_supplicant/test_apps/main/test_eloop.c
@@ -97,6 +97,8 @@ static void eloop_test_wifi_stop(void)
 {
     TEST_ESP_OK(esp_wifi_stop());
     TEST_ESP_OK(esp_wifi_deinit());
+    /* Let the idle task reclaim the deleted Wi-Fi task's stack and TCB before the leak check. */
+    vTaskDelay(300 / portTICK_PERIOD_MS);
 }
 
 static void reset_timeout_ctx(struct timeout_test_ctx *ctx, void *sem)
@@ -269,7 +271,6 @@ TEST_CASE("Test eloop timers run", "[eloop]")
     vTaskDelay(250 / portTICK_PERIOD_MS);
     fired_before_stop = t;
     eloop_test_wifi_stop();
-    vTaskDelay(300 / portTICK_PERIOD_MS);
     TEST_ASSERT_EQUAL(fired_before_stop, t);
     TEST_ASSERT_TRUE(t >= 1);
     TEST_ASSERT_TRUE(t < 6);
diff --git a/components/wpa_supplicant/test_apps/main/test_wifi_external_bss.c b/components/wpa_supplicant/test_apps/main/test_wifi_external_bss.c
index e63355d9225..6143421a504 100644
--- a/components/wpa_supplicant/test_apps/main/test_wifi_external_bss.c
+++ b/components/wpa_supplicant/test_apps/main/test_wifi_external_bss.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -105,7 +105,8 @@ static void stop_wifi(void)
     }
     vTaskDelay(500 / portTICK_PERIOD_MS);
     TEST_ESP_OK(esp_wifi_deinit());
-    vTaskDelay(1);
+    /* Let the idle task reclaim the deleted Wi-Fi task's stack and TCB before the leak check. */
+    vTaskDelay(300 / portTICK_PERIOD_MS);
 }
 
 static void start_wifi_as_sta(void)