diff --git a/components/esp_hw_support/test_apps/.build-test-rules.yml b/components/esp_hw_support/test_apps/.build-test-rules.yml
index a395b60619..b7e85dae37 100644
--- a/components/esp_hw_support/test_apps/.build-test-rules.yml
+++ b/components/esp_hw_support/test_apps/.build-test-rules.yml
@@ -17,10 +17,6 @@ components/esp_hw_support/test_apps/dma2d:
 components/esp_hw_support/test_apps/esp_hw_support_unity_tests:
   disable:
     - if: SOC_GPSPI_SUPPORTED != 1
-  disable_test:
-    - if: IDF_TARGET == "esp32p4"
-      temporary: true
-      reason: test not pass, should be re-enable # TODO: IDF-8972
 
 components/esp_hw_support/test_apps/etm:
   disable:
diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py
index a96369107b..303f5bc685 100644
--- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py
+++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py
@@ -1,11 +1,9 @@
 # SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
-
 import pytest
 from pytest_embedded import Dut
 
 
-@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='esp32p4 support TBD')  # TODO: IDF-8972
 @pytest.mark.generic
 @pytest.mark.parametrize(
     'config',
diff --git a/components/esp_system/test_apps/.build-test-rules.yml b/components/esp_system/test_apps/.build-test-rules.yml
index d35ca3820c..e59aab60e3 100644
--- a/components/esp_system/test_apps/.build-test-rules.yml
+++ b/components/esp_system/test_apps/.build-test-rules.yml
@@ -6,9 +6,7 @@ components/esp_system/test_apps/console:
 
 components/esp_system/test_apps/esp_system_unity_tests:
   disable:
-    - if: IDF_TARGET == "esp32c5" or (CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1)
-      temporary: true
-      reason: C5 not support yet # TODO: [ESP32C5] IDF-8690
+    - if: (CONFIG_NAME == "psram" and SOC_SPIRAM_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 bf47d80ec6..3a502b1f86 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-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
diff --git a/components/esp_timer/test_apps/.build-test-rules.yml b/components/esp_timer/test_apps/.build-test-rules.yml
deleted file mode 100644
index 748bc781b2..0000000000
--- a/components/esp_timer/test_apps/.build-test-rules.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
-
-components/esp_timer/test_apps:
-  disable:
-    - if: IDF_TARGET == "esp32c5"
-      temporary: true
-      reason: C5 not support yet # TODO: [ESP32C5] IDF-8705
diff --git a/components/esp_timer/test_apps/README.md b/components/esp_timer/test_apps/README.md
index c75201fb88..351f5fdebc 100644
--- a/components/esp_timer/test_apps/README.md
+++ b/components/esp_timer/test_apps/README.md
@@ -1,3 +1,3 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
diff --git a/components/freertos/test_apps/.build-test-rules.yml b/components/freertos/test_apps/.build-test-rules.yml
index 83c48f535d..d7bce90918 100644
--- a/components/freertos/test_apps/.build-test-rules.yml
+++ b/components/freertos/test_apps/.build-test-rules.yml
@@ -2,9 +2,9 @@
 
 components/freertos/test_apps/freertos:
   disable:
-    - if: IDF_TARGET == "esp32c5" or (CONFIG_NAME == "smp" and IDF_TARGET == "esp32p4")
+    - if: (CONFIG_NAME == "smp" and IDF_TARGET == "esp32p4")
       temporary: true
-      reason: target(s) not supported yet  # TODO: [ESP32C5] IDF-8672
+      reason: target(s) not supported yet
 
 components/freertos/test_apps/orig_inc_path:
   enable:
diff --git a/components/freertos/test_apps/freertos/README.md b/components/freertos/test_apps/freertos/README.md
index bf47d80ec6..3a502b1f86 100644
--- a/components/freertos/test_apps/freertos/README.md
+++ b/components/freertos/test_apps/freertos/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
diff --git a/components/heap/test_apps/.build-test-rules.yml b/components/heap/test_apps/.build-test-rules.yml
index a55adfc176..1e3b8ecd8c 100644
--- a/components/heap/test_apps/.build-test-rules.yml
+++ b/components/heap/test_apps/.build-test-rules.yml
@@ -3,9 +3,6 @@
 components/heap/test_apps/heap_tests:
   disable:
     - if: IDF_TARGET == "linux"
-    - if: IDF_TARGET == "esp32c5"
-      temporary: true
-      reason: not support yet  # TODO: [ESP32C5] IDF-9641
     - if: CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1
     - if: CONFIG_NAME == "psram_all_ext" and SOC_SPIRAM_SUPPORTED != 1
     # These 3 configs are build only for non-nightly, buildig for a single target is sufficient
diff --git a/components/heap/test_apps/heap_tests/README.md b/components/heap/test_apps/heap_tests/README.md
index 5b39ff9653..b8fe0d892d 100644
--- a/components/heap/test_apps/heap_tests/README.md
+++ b/components/heap/test_apps/heap_tests/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
\ No newline at end of file
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
\ No newline at end of file