diff --git a/components/esp_common/test_apps/esp_common/main/test_attr.c b/components/esp_common/test_apps/esp_common/main/test_attr.c
index 6004eca91d..b2c37d2d2c 100644
--- a/components/esp_common/test_apps/esp_common/main/test_attr.c
+++ b/components/esp_common/test_apps/esp_common/main/test_attr.c
@@ -33,13 +33,13 @@ extern int _ext_ram_bss_end;
 
 //Variables for test: Attributes place variables into correct sections
 static __NOINIT_ATTR uint32_t s_noinit;
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#if SOC_RTC_MEM_SUPPORTED
 static RTC_NOINIT_ATTR uint32_t s_rtc_noinit;
 static RTC_DATA_ATTR uint32_t s_rtc_data;
 static RTC_RODATA_ATTR uint32_t s_rtc_rodata;
 static RTC_FAST_ATTR uint32_t s_rtc_force_fast;
 static RTC_SLOW_ATTR uint32_t s_rtc_force_slow;
-#endif // !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#endif // SOC_RTC_MEM_SUPPORTED
 #if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY
 static EXT_RAM_NOINIT_ATTR uint32_t s_noinit_ext;
 #endif
@@ -54,8 +54,7 @@ TEST_CASE("Attributes place variables into correct sections", "[ld]")
 {
     TEST_ASSERT(data_in_segment(&s_noinit, &_noinit_start, &_noinit_end));
 
-//IDF-5045
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#if SOC_RTC_MEM_SUPPORTED
     TEST_ASSERT(data_in_segment(&s_rtc_noinit, &_rtc_noinit_start, &_rtc_noinit_end));
     TEST_ASSERT(data_in_segment(&s_rtc_data, &_rtc_data_start, &_rtc_data_end));
     TEST_ASSERT(data_in_segment(&s_rtc_rodata, &_rtc_data_start, &_rtc_data_end));
@@ -76,7 +75,7 @@ TEST_CASE("Attributes place variables into correct sections", "[ld]")
 
     TEST_ASSERT(data_in_segment(&s_rtc_force_fast, (int*) SOC_RTC_DRAM_LOW, (int*) SOC_RTC_DRAM_HIGH));
     TEST_ASSERT(data_in_segment(&s_rtc_force_slow, (int*) SOC_RTC_DATA_LOW, (int*) SOC_RTC_DATA_HIGH));
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#endif // SOC_RTC_MEM_SUPPORTED
 
 #if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY
     TEST_ASSERT(data_in_segment(&s_noinit_ext, &_ext_ram_noinit_start, &_ext_ram_noinit_end));
diff --git a/components/esp_common/test_apps/esp_common/sdkconfig.ci.esp32_psram b/components/esp_common/test_apps/esp_common/sdkconfig.ci.esp32_psram
index d1bd6e7db0..1a7b7d83b7 100644
--- a/components/esp_common/test_apps/esp_common/sdkconfig.ci.esp32_psram
+++ b/components/esp_common/test_apps/esp_common/sdkconfig.ci.esp32_psram
@@ -1,10 +1,6 @@
 CONFIG_IDF_TARGET="esp32"
 CONFIG_SPIRAM=y
-CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
 CONFIG_SPIRAM_OCCUPY_NO_HOST=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
-CONFIG_ESP32_WIFI_IRAM_OPT=n
-# Disable encrypted flash reads/writes to save IRAM in this build configuration
 CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
 CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY=y
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
diff --git a/components/esp_common/test_apps/esp_common/sdkconfig.defaults b/components/esp_common/test_apps/esp_common/sdkconfig.defaults
index 95033f3fc2..b308cb2ddd 100644
--- a/components/esp_common/test_apps/esp_common/sdkconfig.defaults
+++ b/components/esp_common/test_apps/esp_common/sdkconfig.defaults
@@ -1,3 +1,2 @@
 CONFIG_FREERTOS_HZ=1000
 CONFIG_ESP_TASK_WDT=n
-CONFIG_SPIRAM=y