diff --git a/components/esp_netif/test/test_esp_netif.c b/components/esp_netif/test/test_esp_netif.c
index a3d844709..2e2a1e990 100644
--- a/components/esp_netif/test/test_esp_netif.c
+++ b/components/esp_netif/test/test_esp_netif.c
@@ -63,6 +63,7 @@ TEST_CASE("esp_netif: create and delete multiple netifs", "[esp_netif][leaks=0]"
 
 }
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 TEST_CASE("esp_netif: test dhcp client state transitions for wifi station", "[esp_netif]")
 {
     // init default wifi netif
@@ -189,6 +190,7 @@ TEST_CASE("esp_netif: test dhcp state transitions for mesh netifs", "[esp_netif]
     TEST_ASSERT(esp_wifi_deinit() == ESP_OK);
     nvs_flash_deinit();
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 
 TEST_CASE("esp_netif: create custom wifi interfaces", "[esp_netif][leaks=0]")
 {
diff --git a/components/esp_wifi/test/test_wifi.c b/components/esp_wifi/test/test_wifi.c
index c0d49d274..490d8ac2d 100644
--- a/components/esp_wifi/test/test_wifi.c
+++ b/components/esp_wifi/test/test_wifi.c
@@ -14,7 +14,6 @@
 #include "freertos/task.h"
 #include "freertos/event_groups.h"
 
-static const char* TAG = "test_wifi";
 
 #define DEFAULT_SSID "TEST_SSID"
 #define DEFAULT_PWD "TEST_PASS"
@@ -24,6 +23,8 @@ static const char* TAG = "test_wifi";
 
 #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;
 
 static EventGroupHandle_t wifi_events;
@@ -169,8 +170,6 @@ TEST_CASE("wifi stop and deinit","[wifi]")
     TEST_IGNORE_MESSAGE("this test case is ignored due to the critical memory leak of esp_netif and event_loop.");
 }
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
-
 static void start_wifi_as_softap(void)
 {
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
@@ -343,4 +342,4 @@ 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
\ No newline at end of file
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
\ No newline at end of file
diff --git a/components/esp_wifi/test/test_wifi_init.c b/components/esp_wifi/test/test_wifi_init.c
index d59be611d..7350b3730 100644
--- a/components/esp_wifi/test/test_wifi_init.c
+++ b/components/esp_wifi/test/test_wifi_init.c
@@ -13,6 +13,7 @@
 #define EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT 0x00000001
 #define EMPH_STR(s) "****** "s" ******"
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 static const char* TAG = "test_wifi_init";
 static uint32_t wifi_event_handler_flag;
 static EventGroupHandle_t wifi_events;
@@ -210,3 +211,4 @@ TEST_CASE("Calling esp_wifi_stop() without start", "[wifi_init]")
     sema = NULL;
     TEST_IGNORE_MESSAGE("this test case is ignored due to the event_loop.");
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
diff --git a/components/mbedtls/test/test_mbedtls_sha.c b/components/mbedtls/test/test_mbedtls_sha.c
index 64eae7244..9408f1462 100644
--- a/components/mbedtls/test/test_mbedtls_sha.c
+++ b/components/mbedtls/test/test_mbedtls_sha.c
@@ -164,6 +164,7 @@ void tskRunSHASelftests(void *param)
     vTaskDelete(NULL);
 }
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 TEST_CASE("mbedtls SHA self-tests multithreaded", "[mbedtls]")
 {
     done_sem = xSemaphoreCreateCounting(2, 0);
@@ -179,6 +180,7 @@ TEST_CASE("mbedtls SHA self-tests multithreaded", "[mbedtls]")
     }
     vSemaphoreDelete(done_sem);
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 
 TEST_CASE("mbedtls SHA512 clone", "[mbedtls]")
 {
diff --git a/components/mqtt/test/test_mqtt.c b/components/mqtt/test/test_mqtt.c
index 12cd1777b..7e6ed299d 100644
--- a/components/mqtt/test/test_mqtt.c
+++ b/components/mqtt/test/test_mqtt.c
@@ -15,15 +15,6 @@ static void test_leak_setup(const char * file, long line)
     unity_reset_leak_checks();
 }
 
-static const char* this_bin_addr(void)
-{
-    spi_flash_mmap_handle_t out_handle;
-    const void *binary_address;
-    const esp_partition_t* partition = esp_ota_get_running_partition();
-    esp_partition_mmap(partition, 0, partition->size, SPI_FLASH_MMAP_DATA, &binary_address, &out_handle);
-    return binary_address;
-}
-
 TEST_CASE("mqtt init with invalid url", "[mqtt][leaks=0]")
 {
     test_leak_setup(__FILE__, __LINE__);
@@ -38,7 +29,7 @@ TEST_CASE("mqtt init and deinit", "[mqtt][leaks=0]")
 {
     test_leak_setup(__FILE__, __LINE__);
     const esp_mqtt_client_config_t mqtt_cfg = {
-            // no connection takes place, but the uri has to be valid for init() to succeed 
+            // no connection takes place, but the uri has to be valid for init() to succeed
             .uri = "mqtts://localhost:8883",
     };
     esp_mqtt_client_handle_t client = esp_mqtt_client_init(&mqtt_cfg);
@@ -46,6 +37,16 @@ TEST_CASE("mqtt init and deinit", "[mqtt][leaks=0]")
     esp_mqtt_client_destroy(client);
 }
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
+static const char* this_bin_addr(void)
+{
+    spi_flash_mmap_handle_t out_handle;
+    const void *binary_address;
+    const esp_partition_t* partition = esp_ota_get_running_partition();
+    esp_partition_mmap(partition, 0, partition->size, SPI_FLASH_MMAP_DATA, &binary_address, &out_handle);
+    return binary_address;
+}
+
 TEST_CASE("mqtt enqueue and destroy outbox", "[mqtt][leaks=0]")
 {
     const char * bin_addr = this_bin_addr();
@@ -53,7 +54,7 @@ TEST_CASE("mqtt enqueue and destroy outbox", "[mqtt][leaks=0]")
     const int messages = 20;
     const int size = 2000;
     const esp_mqtt_client_config_t mqtt_cfg = {
-            // no connection takes place, but the uri has to be valid for init() to succeed 
+            // no connection takes place, but the uri has to be valid for init() to succeed
             .uri = "mqtts://localhost:8883",
     };
     esp_mqtt_client_handle_t client = esp_mqtt_client_init(&mqtt_cfg);
@@ -67,4 +68,5 @@ TEST_CASE("mqtt enqueue and destroy outbox", "[mqtt][leaks=0]")
     TEST_ASSERT_GREATER_OR_EQUAL(messages*size, bytes_before - bytes_after);
 
     esp_mqtt_client_destroy(client);
-}
\ No newline at end of file
+}
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
diff --git a/components/protocomm/test/test_protocomm.c b/components/protocomm/test/test_protocomm.c
index 33d547b3d..a238584f8 100644
--- a/components/protocomm/test/test_protocomm.c
+++ b/components/protocomm/test/test_protocomm.c
@@ -878,7 +878,7 @@ static esp_err_t test_security1_wrong_pop (void)
     return ESP_OK;
 }
 
-static esp_err_t test_security1_insecure_client (void)
+__attribute__((unused)) static esp_err_t test_security1_insecure_client (void)
 {
     ESP_LOGI(TAG, "Starting Security 1 insecure client test");
 
@@ -930,7 +930,7 @@ static esp_err_t test_security1_insecure_client (void)
     return ESP_OK;
 }
 
-static esp_err_t test_security1_weak_session (void)
+__attribute__((unused)) static esp_err_t test_security1_weak_session (void)
 {
     ESP_LOGI(TAG, "Starting Security 1 weak session test");
 
@@ -1098,6 +1098,7 @@ static esp_err_t test_security0 (void)
     return ESP_OK;
 }
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 TEST_CASE("leak test", "[PROTOCOMM]")
 {
 #ifdef CONFIG_HEAP_TRACING
@@ -1138,6 +1139,7 @@ TEST_CASE("leak test", "[PROTOCOMM]")
 
     TEST_ASSERT(pre_start_mem == post_stop_mem);
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 
 TEST_CASE("security 0 basic test", "[PROTOCOMM]")
 {
@@ -1164,6 +1166,7 @@ TEST_CASE("security 1 wrong pop test", "[PROTOCOMM]")
     TEST_ASSERT(test_security1_wrong_pop() == ESP_OK);
 }
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 TEST_CASE("security 1 insecure client test", "[PROTOCOMM]")
 {
     TEST_ASSERT(test_security1_insecure_client() == ESP_OK);
@@ -1173,3 +1176,4 @@ TEST_CASE("security 1 weak session test", "[PROTOCOMM]")
 {
     TEST_ASSERT(test_security1_weak_session() == ESP_OK);
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
diff --git a/components/spi_flash/test/test_large_flash_writes.c b/components/spi_flash/test/test_large_flash_writes.c
index 11824cd11..c4985c98e 100644
--- a/components/spi_flash/test/test_large_flash_writes.c
+++ b/components/spi_flash/test/test_large_flash_writes.c
@@ -29,6 +29,7 @@
 #include "../cache_utils.h"
 #include "soc/timer_periph.h"
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 static const uint8_t large_const_buffer[16400] = {
     203, // first byte
     1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
@@ -93,3 +94,4 @@ static void test_write_large_buffer(const uint8_t *source, size_t length)
     TEST_ASSERT_EQUAL_HEX8(0xFF, ends[2]);
     TEST_ASSERT_EQUAL_HEX8(0xFF, ends[3]);
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
diff --git a/components/spi_flash/test/test_mmap.c b/components/spi_flash/test/test_mmap.c
index 4c38511f5..c70644889 100644
--- a/components/spi_flash/test/test_mmap.c
+++ b/components/spi_flash/test/test_mmap.c
@@ -349,6 +349,7 @@ TEST_CASE("flash_mmap can mmap after get enough free MMU pages", "[spi_flash][mm
     TEST_ASSERT_EQUAL_PTR(NULL, spi_flash_phys2cache(start, SPI_FLASH_MMAP_DATA));
 }
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 TEST_CASE("phys2cache/cache2phys basic checks", "[spi_flash][mmap]")
 {
     uint8_t buf[64];
@@ -381,6 +382,7 @@ TEST_CASE("phys2cache/cache2phys basic checks", "[spi_flash][mmap]")
     spi_flash_read_maybe_encrypted(phys, buf, sizeof(constant_data));
     TEST_ASSERT_EQUAL_HEX8_ARRAY(constant_data, buf, sizeof(constant_data));
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 
 TEST_CASE("mmap consistent with phys2cache/cache2phys", "[spi_flash][mmap]")
 {
diff --git a/components/spi_flash/test/test_partitions.c b/components/spi_flash/test/test_partitions.c
index cd46f723c..59d9e2034 100644
--- a/components/spi_flash/test/test_partitions.c
+++ b/components/spi_flash/test/test_partitions.c
@@ -27,6 +27,7 @@
 #include <esp_partition.h>
 #include <esp_attr.h>
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 TEST_CASE("Test erase partition", "[spi_flash][esp_flash]")
 {
     const esp_partition_t *part = get_test_data_partition();
@@ -68,6 +69,7 @@ TEST_CASE("Test erase partition", "[spi_flash][esp_flash]")
         }
     }
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 
 static bool s_test_nonzero_sha_of_partition(const esp_partition_t *part, bool allow_invalid_image)
 {
@@ -102,6 +104,7 @@ TEST_CASE("Test esp_partition_get_sha256() with data", "[spi_flash]")
     s_test_nonzero_sha_of_partition(part, false);
 }
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 TEST_CASE("Test esp_partition_get_sha256() with app", "[spi_flash]")
 {
     bool found_valid_app = false;
@@ -121,4 +124,5 @@ TEST_CASE("Test esp_partition_get_sha256() with app", "[spi_flash]")
 
     TEST_ASSERT_MESSAGE(found_valid_app, "At least one app partition should be a valid app partition");
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 
diff --git a/components/spi_flash/test/test_read_write.c b/components/spi_flash/test/test_read_write.c
index cfb82761d..906a55f45 100644
--- a/components/spi_flash/test/test_read_write.c
+++ b/components/spi_flash/test/test_read_write.c
@@ -30,6 +30,8 @@
 
 #define MIN_BLOCK_SIZE  12
 /* Base offset in flash for tests. */
+
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 static size_t start;
 
 static void setup_tests(void)
@@ -138,6 +140,7 @@ TEST_CASE("Test spi_flash_read", "[spi_flash][esp_flash]")
     }
 #endif
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 
 #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 static void IRAM_ATTR test_write(int dst_off, int src_off, int len)
diff --git a/components/wpa_supplicant/test/test_crypto.c b/components/wpa_supplicant/test/test_crypto.c
index e8f8d05a5..7741e5287 100644
--- a/components/wpa_supplicant/test/test_crypto.c
+++ b/components/wpa_supplicant/test/test_crypto.c
@@ -23,6 +23,7 @@
 #include "mbedtls/ecp.h"
 typedef struct crypto_bignum crypto_bignum;
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 TEST_CASE("Test crypto lib bignum apis", "[wpa_crypto]")
 {
     {
@@ -278,6 +279,7 @@ TEST_CASE("Test crypto lib bignum apis", "[wpa_crypto]")
 
     }
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 
 
 /*
diff --git a/components/wpa_supplicant/test/test_sae.c b/components/wpa_supplicant/test/test_sae.c
index b5d244de7..0a4f9298b 100644
--- a/components/wpa_supplicant/test/test_sae.c
+++ b/components/wpa_supplicant/test/test_sae.c
@@ -27,6 +27,7 @@
 
 typedef struct crypto_bignum crypto_bignum;
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 static struct wpabuf *wpabuf_alloc2(size_t len)
 {
     struct wpabuf *buf = (struct wpabuf *)os_zalloc(sizeof(struct wpabuf) + len);
@@ -266,5 +267,6 @@ TEST_CASE("Test SAE functionality with ECC group", "[wpa3_sae]")
     ESP_LOGI("SAE Test", "=========== Complete ============");
 
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 
 #endif /* CONFIG_WPA3_SAE */