diff --git a/components/esp_hw_support/port/esp32s31/cpu_region_protect.c b/components/esp_hw_support/port/esp32s31/cpu_region_protect.c
index eabf5ffb0b..cd0c02ce1a 100644
--- a/components/esp_hw_support/port/esp32s31/cpu_region_protect.c
+++ b/components/esp_hw_support/port/esp32s31/cpu_region_protect.c
@@ -15,7 +15,7 @@
 #include "esp_private/esp_psram_extram.h"
 #endif /* CONFIG_SPIRAM */
 
-/* TODO: [ESP32S31] IDF-14655 */
+/* TODO: [ESP32S31] IDF-15238 */
 
 #ifdef BOOTLOADER_BUILD
 // Without L bit set
@@ -39,5 +39,5 @@
 
 void esp_cpu_configure_region_protection(void)
 {
-    /* TODO: [ESP32S31] IDF-14655 */
+    /* TODO: [ESP32S31] IDF-15238 */
 }
diff --git a/tools/test_apps/system/.build-test-rules.yml b/tools/test_apps/system/.build-test-rules.yml
index e32f8c8b2f..1dd3204310 100644
--- a/tools/test_apps/system/.build-test-rules.yml
+++ b/tools/test_apps/system/.build-test-rules.yml
@@ -164,10 +164,8 @@ tools/test_apps/system/test_watchpoint:
     - if: IDF_TARGET in ["esp32", "esp32c3"] # Just one test per architecture
 
 tools/test_apps/system/unicore_bootloader:
-  enable:
-    - if: SOC_CPU_CORES_NUM > 1
-      reason: the test should be run on multicore chips
   disable:
-    - if: IDF_TARGET == "esp32s31"
-      temporary: true
-      reason: not supported yet # TODO: IDF-14685
+    - if: SOC_CPU_CORES_NUM == 1
+      reason: the test is only relevant for multicore chips
+    - if: CONFIG_NAME == "unicore_psram" and SOC_PSRAM_SUPPORTED != 1
+    - if: CONFIG_NAME == "multicore_psram" and SOC_PSRAM_SUPPORTED != 1
diff --git a/tools/test_apps/system/unicore_bootloader/README.md b/tools/test_apps/system/unicore_bootloader/README.md
index d4c0badc33..8198851e76 100644
--- a/tools/test_apps/system/unicore_bootloader/README.md
+++ b/tools/test_apps/system/unicore_bootloader/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-H4 | ESP32-P4 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-H4 | ESP32-P4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | --------- |