diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig
index 11c8230669c..b21b5ee558e 100644
--- a/components/esp_wifi/Kconfig
+++ b/components/esp_wifi/Kconfig
@@ -656,12 +656,6 @@ menu "Wi-Fi"
             Enabling this could increase the build size ~60kb
             depending on the project logging level.
 
-    config ESP_WIFI_TESTING_OPTIONS
-        bool "Add DPP testing code"
-        default n
-        help
-            Select this to enable unity test for DPP.
-
     config ESP_WIFI_ENTERPRISE_SUPPORT
         bool "Enable enterprise option"
         default y
diff --git a/components/esp_wifi/sdkconfig.rename b/components/esp_wifi/sdkconfig.rename
index d6c1642ce21..8a6af788697 100644
--- a/components/esp_wifi/sdkconfig.rename
+++ b/components/esp_wifi/sdkconfig.rename
@@ -37,7 +37,6 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT           CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
 CONFIG_WPA_WAPI_PSK                     CONFIG_ESP_WIFI_WAPI_PSK
 CONFIG_WPA_SUITE_B_192                  CONFIG_ESP_WIFI_SUITE_B_192
 CONFIG_WPA_DEBUG_PRINT                  CONFIG_ESP_WIFI_DEBUG_PRINT
-CONFIG_WPA_TESTING_OPTIONS              CONFIG_ESP_WIFI_TESTING_OPTIONS
 CONFIG_WPA_WPS_STRICT                   CONFIG_ESP_WIFI_WPS_STRICT
 CONFIG_WPA_11KV_SUPPORT                 CONFIG_ESP_WIFI_11KV_SUPPORT
 CONFIG_WPA_SCAN_CACHE                   CONFIG_ESP_WIFI_SCAN_CACHE
diff --git a/components/wpa_supplicant/test_apps/main/Kconfig.projbuild b/components/wpa_supplicant/test_apps/main/Kconfig.projbuild
new file mode 100644
index 00000000000..56c375789c6
--- /dev/null
+++ b/components/wpa_supplicant/test_apps/main/Kconfig.projbuild
@@ -0,0 +1,3 @@
+config ESP_WIFI_TESTING_OPTIONS
+    bool
+    default y
diff --git a/components/wpa_supplicant/test_apps/main/test_fast_pbkdf2.c b/components/wpa_supplicant/test_apps/main/test_fast_pbkdf2.c
index 2a8017709d6..07002a436e1 100644
--- a/components/wpa_supplicant/test_apps/main/test_fast_pbkdf2.c
+++ b/components/wpa_supplicant/test_apps/main/test_fast_pbkdf2.c
@@ -88,10 +88,12 @@ TEST_CASE("Test pbkdf2", "[crypto-pbkdf2]")
         }
         TEST_ASSERT(memcmp(PMK, expected_pmk, PMK_LEN) == 0);
 
+#if 0
         start_time = esp_timer_get_time();
         fastpbkdf2_hmac_sha1((const u8 *)passphrase, os_strlen((char *)passphrase), ssid, ssid_len, 4096, PMK, PMK_LEN);
         end_time = esp_timer_get_time();
         total_time_fast_pbkdf2 += (end_time - start_time);
+#endif
     }
 
     // Calculate average time for pbkdf2_sha1
diff --git a/components/wpa_supplicant/test_apps/main/test_offchannel.c b/components/wpa_supplicant/test_apps/main/test_offchannel.c
index 9e5ef6f5bce..a92ebd822f0 100644
--- a/components/wpa_supplicant/test_apps/main/test_offchannel.c
+++ b/components/wpa_supplicant/test_apps/main/test_offchannel.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  *
@@ -28,16 +28,13 @@
 #include "test_wpa_supplicant_common.h"
 #include "sdkconfig.h"
 
-#define WIFI_START_EVENT        0x00000001
-#define WIFI_ROC_DONE_EVENT     0x00000002
-#define WIFI_ACTION_RX_EVENT    0x00000003
-#define WIFI_SCAN_DONE_EVENT    0x00000004
+#define WIFI_START_EVENT        BIT(0)
+#define WIFI_ROC_DONE_EVENT     BIT(1)
+#define WIFI_ACTION_RX_EVENT    BIT(2)
+#define WIFI_SCAN_DONE_EVENT    BIT(3)
 
 #define TEST_LISTEN_CHANNEL     6
 
-/* No runners; IDF-5046 */
-#if CONFIG_IDF_TARGET_ESP32
-
 static const char *TAG = "test_offchan";
 esp_netif_t *wifi_netif;
 static EventGroupHandle_t wifi_event;
@@ -244,5 +241,3 @@ static void test_wifi_roc(void)
 }
 
 TEST_CASE_MULTIPLE_DEVICES("test ROC and Offchannel Action Frame Tx", "[Offchan][test_env=wifi_two_dut][timeout=90]", test_wifi_roc, test_wifi_offchan_tx);
-
-#endif //CONFIG_IDF_TARGET_ESP32
diff --git a/components/wpa_supplicant/test_apps/pytest_wpa_supplicant_ut.py b/components/wpa_supplicant/test_apps/pytest_wpa_supplicant_ut.py
index 19d64208b40..2904ef3a622 100644
--- a/components/wpa_supplicant/test_apps/pytest_wpa_supplicant_ut.py
+++ b/components/wpa_supplicant/test_apps/pytest_wpa_supplicant_ut.py
@@ -17,6 +17,11 @@ def test_wpa_supplicant_ut(dut: Dut) -> None:
 
 
 @pytest.mark.esp32
+@pytest.mark.esp32c3
+@pytest.mark.esp32s2
+@pytest.mark.esp32s3
+@pytest.mark.esp32c2
+@pytest.mark.esp32c6
 @pytest.mark.wifi_two_dut
 @pytest.mark.parametrize(
     'count',
diff --git a/components/wpa_supplicant/test_apps/sdkconfig.ci b/components/wpa_supplicant/test_apps/sdkconfig.ci
new file mode 100644
index 00000000000..e69de29bb2d