diff --git a/components/esp_wifi/test/test_phy_rtc.c b/components/esp_wifi/test/test_phy_rtc.c
index 53ba4fbc49..7a5b82c117 100644
--- a/components/esp_wifi/test/test_phy_rtc.c
+++ b/components/esp_wifi/test/test_phy_rtc.c
@@ -26,9 +26,9 @@ extern void IRAM_ATTR spi_flash_enable_interrupts_caches_and_other_cpu(void);
 #ifdef SOC_BT_SUPPORTED
 extern void bt_bb_init_cmplx_reg(void);
 extern void bt_track_pll_cap(void);
-#endif
 extern void force_wifi_mode(int);
 extern void unforce_wifi_mode(void);
+#endif
 
 static const char* TAG = "test_phy_rtc";
 
@@ -59,6 +59,7 @@ static IRAM_ATTR void test_phy_rtc_cache_task(void *arg)
 {
     test_phy_rtc_init();
 
+#ifdef SOC_BT_SUPPORTED
     for (int i = 0; i < 2; i++) {
         ESP_LOGI(TAG, "Test force_wifi_mode(%d)...", i);
         spi_flash_disable_interrupts_caches_and_other_cpu();
@@ -71,7 +72,6 @@ static IRAM_ATTR void test_phy_rtc_cache_task(void *arg)
         spi_flash_enable_interrupts_caches_and_other_cpu();
     }
 
-#ifdef SOC_BT_SUPPORTED
     ESP_LOGI(TAG, "Test bt_bb_init_cmplx_reg()...");
     spi_flash_disable_interrupts_caches_and_other_cpu();
     bt_bb_init_cmplx_reg();
@@ -99,5 +99,4 @@ TEST_CASE("Test PHY/RTC functions called when cache is disabled", "[phy_rtc][cac
 
     vSemaphoreDelete(semphr_done);
 }
-
-#endif
\ No newline at end of file
+#endif
diff --git a/components/esp_wifi/test/test_wifi.c b/components/esp_wifi/test/test_wifi.c
index 490d8ac2d6..0c1d742b33 100644
--- a/components/esp_wifi/test/test_wifi.c
+++ b/components/esp_wifi/test/test_wifi.c
@@ -23,7 +23,6 @@
 
 #define EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT 0x00000001
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 static const char* TAG = "test_wifi";
 static uint32_t wifi_event_handler_flag;
 
@@ -341,5 +340,3 @@ static void test_wifi_connection_softap(void)
 }
 
 TEST_CASE_MULTIPLE_DEVICES("test wifi retain connection for 60s", "[wifi][test_env=UT_T2_1][timeout=90]", test_wifi_connection_sta, test_wifi_connection_softap);
-
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
\ No newline at end of file
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index 987f268011..34a52ff300 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -561,6 +561,12 @@ UT_036:
     - UT_T1_PSRAMV0
     - psram
 
+UT_037:
+  extends: .unit_test_template
+  tags:
+    - ESP32S2_IDF
+    - UT_T2_1
+
 # ToDo: re-enable this job when ESP32-S2 LEDC runner installed
 # UT_037:
 #   extends: .unit_test_template