diff --git a/components/esp_system/test_apps/.build-test-rules.yml b/components/esp_system/test_apps/.build-test-rules.yml
index bada4394fb..b2cf5b58a5 100644
--- a/components/esp_system/test_apps/.build-test-rules.yml
+++ b/components/esp_system/test_apps/.build-test-rules.yml
@@ -8,9 +8,7 @@ components/esp_system/test_apps/esp_system_unity_tests:
   disable:
     - if: (CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1)
     - if: (CONFIG_NAME == "psram_with_pd_top" and (SOC_SPIRAM_SUPPORTED != 1 or SOC_PM_SUPPORT_TOP_PD != 1))
-    - if: IDF_TARGET == "esp32s31"
-      temporary: true
-      reason: cannot pass build because of pm not supported yet # TODO: [ESP32S31] IDF-14648
+    - if: (CONFIG_NAME == "pd_vddsdio" and (SOC_LIGHT_SLEEP_SUPPORTED != 1))
 
 components/esp_system/test_apps/linux_apis:
   enable:
diff --git a/components/esp_system/test_apps/esp_system_unity_tests/README.md b/components/esp_system/test_apps/esp_system_unity_tests/README.md
index 44f3780f1d..d76348d52c 100644
--- a/components/esp_system/test_apps/esp_system_unity_tests/README.md
+++ b/components/esp_system/test_apps/esp_system_unity_tests/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | --------- |
diff --git a/components/freertos/Kconfig b/components/freertos/Kconfig
index aaa7369195..cff15aab55 100644
--- a/components/freertos/Kconfig
+++ b/components/freertos/Kconfig
@@ -6,7 +6,8 @@ menu "FreeRTOS"
 
         config FREERTOS_SMP
             bool "Run the Amazon SMP FreeRTOS kernel instead (FEATURE UNDER DEVELOPMENT)"
-            depends on !IDF_TARGET_ESP32P4 && !IDF_TARGET_ESP32H4  #TODO: IDF-8113: Enable P4/H4 support on AMZ SMP
+            # TODO: IDF-8113: Enable P4/H4/S31 support on AMZ SMP
+            depends on !IDF_TARGET_ESP32P4 && !IDF_TARGET_ESP32H4 && !IDF_TARGET_ESP32S31
             default  "n"
             help
                 Amazon has released an SMP version of the FreeRTOS Kernel which can be found via the following link:
diff --git a/components/freertos/test_apps/.build-test-rules.yml b/components/freertos/test_apps/.build-test-rules.yml
index 28b6c6cb91..021f5de58f 100644
--- a/components/freertos/test_apps/.build-test-rules.yml
+++ b/components/freertos/test_apps/.build-test-rules.yml
@@ -3,9 +3,6 @@
 components/freertos/test_apps/build_tests/freertos_build_test:
   disable:
     - if: CONFIG_NAME == "timers_disabled" and IDF_TARGET != "esp32"
-    - if: IDF_TARGET in ["esp32s31"]
-      temporary: true
-      reason: not support yet, smp build failed # TODO: [ESP32S31] IDF-14685
   depends_components:
     - freertos
     - esp_system # trigger on changes to idle / tick hooks, wdt, entry point to freertos code
@@ -20,12 +17,9 @@ components/freertos/test_apps/build_tests/orig_inc_path:
 
 components/freertos/test_apps/freertos:
   disable:
-    - if: CONFIG_NAME == "smp" and IDF_TARGET in ["esp32p4"]
+    - if: CONFIG_NAME == "smp" and IDF_TARGET in ["esp32p4", "esp32s31"]
       temporary: true
       reason: target(s) not supported yet
-    - if: IDF_TARGET in ["esp32s31"]
-      temporary: true
-      reason: not support yet # TODO: [ESP32S31] IDF-14685
     - if: CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1
   depends_components:
     - freertos
diff --git a/components/freertos/test_apps/build_tests/freertos_build_test/README.md b/components/freertos/test_apps/build_tests/freertos_build_test/README.md
index 4dc5fc5657..8189528f2d 100644
--- a/components/freertos/test_apps/build_tests/freertos_build_test/README.md
+++ b/components/freertos/test_apps/build_tests/freertos_build_test/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | --------- |
 
 This project tests building with different FreeRTOS configurations.
 
diff --git a/components/freertos/test_apps/freertos/README.md b/components/freertos/test_apps/freertos/README.md
index 31c1c55afe..7c099eae5a 100644
--- a/components/freertos/test_apps/freertos/README.md
+++ b/components/freertos/test_apps/freertos/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | --------- |
 
 
 
diff --git a/components/freertos/test_apps/freertos/kernel/tasks/test_vTaskSuspendAll_xTaskResumeAll.c b/components/freertos/test_apps/freertos/kernel/tasks/test_vTaskSuspendAll_xTaskResumeAll.c
index 609fe2e55f..ff395898c2 100644
--- a/components/freertos/test_apps/freertos/kernel/tasks/test_vTaskSuspendAll_xTaskResumeAll.c
+++ b/components/freertos/test_apps/freertos/kernel/tasks/test_vTaskSuspendAll_xTaskResumeAll.c
@@ -730,6 +730,7 @@ static void test_susp_task(void *arg)
     vTaskSuspend(NULL);
 }
 
+#if SOC_GPTIMER_SUPPORTED
 TEST_CASE("Test xTaskSuspendAll on all cores pends all tasks and xTaskResumeAll on all cores resumes all tasks", "[freertos]")
 {
     volatile bool has_run[TEST_PENDED_NUM_BLOCKED_TASKS];
@@ -786,6 +787,7 @@ TEST_CASE("Test xTaskSuspendAll on all cores pends all tasks and xTaskResumeAll
     vTaskDelete(susp_task);
     vSemaphoreDelete(done_sem);
 }
+#endif //SOC_GPTIMER_SUPPORTED
 #endif  // !CONFIG_FREERTOS_UNICORE
 
 /* ---------------------------------------------------------------------------------------------------------------------