diff --git a/components/pthread/test/test_pthread_cxx.cpp b/components/pthread/test/test_pthread_cxx.cpp
index 6be75f1101..f7131bbf74 100644
--- a/components/pthread/test/test_pthread_cxx.cpp
+++ b/components/pthread/test/test_pthread_cxx.cpp
@@ -97,8 +97,6 @@ TEST_CASE("pthread C++", "[pthread]")
     global_sp_recur_mtx.reset();
 }
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
-//IDF-5142
 static void task_test_sandbox()
 {
     std::stringstream ss;
@@ -138,6 +136,4 @@ TEST_CASE("pthread mix C/C++", "[pthread]")
         t1.join();
     }
 }
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
-
 #endif
diff --git a/components/pthread/test/test_pthread_local_storage.c b/components/pthread/test/test_pthread_local_storage.c
index e74f5734a2..1047f2f175 100644
--- a/components/pthread/test/test_pthread_local_storage.c
+++ b/components/pthread/test/test_pthread_local_storage.c
@@ -174,9 +174,6 @@ typedef struct {
 } destr_test_state_t;
 
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
-//IDF-5142
-
 static void s_test_repeat_destructor(void *vp_state);
 static void *s_test_repeat_destructor_thread(void *vp_state);
 
@@ -253,4 +250,3 @@ static void *s_test_repeat_destructor_thread(void *vp_state)
     }
     pthread_exit(NULL);
 }
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
diff --git a/components/ulp/test/CMakeLists.txt b/components/ulp/test/CMakeLists.txt
index 5123ea2190..3154f7d93e 100644
--- a/components/ulp/test/CMakeLists.txt
+++ b/components/ulp/test/CMakeLists.txt
@@ -3,8 +3,8 @@ if(IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET STREQUAL "esp32s3")
     return()
 endif()
 
-if(IDF_TARGET STREQUAL "esp32c2")
-    # IDF-5048
+if(NOT CONFIG_ULP_COPROC_TYPE_FSM AND NOT CONFIG_ULP_COPROC_TYPE_RISCV)
+    # Nothing to test if no co-processor enabled
     return()
 endif()
 
diff --git a/examples/system/esp_event/user_event_loops/README.md b/examples/system/esp_event/user_event_loops/README.md
index 2c101d6563..9580b779e2 100644
--- a/examples/system/esp_event/user_event_loops/README.md
+++ b/examples/system/esp_event/user_event_loops/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 |
-| ----------------- | ----- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
 
 # User Event Loops Example
 
diff --git a/examples/system/esp_event/user_event_loops/pytest_esp_event_user.py b/examples/system/esp_event/user_event_loops/pytest_esp_event_user.py
index 3c1edad083..33275591f1 100644
--- a/examples/system/esp_event/user_event_loops/pytest_esp_event_user.py
+++ b/examples/system/esp_event/user_event_loops/pytest_esp_event_user.py
@@ -12,11 +12,7 @@ TASK_ITERATION_POSTING = 'posting TASK_EVENTS:TASK_ITERATION_EVENT to {}, iterat
 TASK_ITERATION_HANDLING = 'handling TASK_EVENTS:TASK_ITERATION_EVENT from {}, iteration {}'
 
 
-# IDF-5051
-@pytest.mark.esp32
-@pytest.mark.esp32s2
-@pytest.mark.esp32s3
-@pytest.mark.esp32c3
+@pytest.mark.supported_targets
 @pytest.mark.generic
 def test_esp_event_user_event_loops(dut: Dut) -> None:
 
diff --git a/examples/system/eventfd/README.md b/examples/system/eventfd/README.md
index 2ee63c4838..1b6071cabe 100644
--- a/examples/system/eventfd/README.md
+++ b/examples/system/eventfd/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 |
-| ----------------- | ----- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
 
 # eventfd example
 
diff --git a/examples/system/eventfd/pytest_eventfd.py b/examples/system/eventfd/pytest_eventfd.py
index 4548c36b7a..093879a19f 100644
--- a/examples/system/eventfd/pytest_eventfd.py
+++ b/examples/system/eventfd/pytest_eventfd.py
@@ -8,8 +8,8 @@ import pytest
 from pytest_embedded import Dut
 
 
-# IDF-5051
 @pytest.mark.esp32
+@pytest.mark.esp32c2
 @pytest.mark.esp32s2
 @pytest.mark.esp32s3
 @pytest.mark.esp32c3
diff --git a/examples/system/freertos/real_time_stats/README.md b/examples/system/freertos/real_time_stats/README.md
index 3abfffb8c0..f07d6eeedf 100644
--- a/examples/system/freertos/real_time_stats/README.md
+++ b/examples/system/freertos/real_time_stats/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 |
-| ----------------- | ----- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
 
 # FreeRTOS Real Time Stats Example
 
diff --git a/examples/system/freertos/real_time_stats/pytest_freertos_real_time_stats.py b/examples/system/freertos/real_time_stats/pytest_freertos_real_time_stats.py
index 87a762fd43..d0dbad2d1e 100644
--- a/examples/system/freertos/real_time_stats/pytest_freertos_real_time_stats.py
+++ b/examples/system/freertos/real_time_stats/pytest_freertos_real_time_stats.py
@@ -5,11 +5,7 @@ import pytest
 from pytest_embedded import Dut
 
 
-# IDF-5051
-@pytest.mark.esp32
-@pytest.mark.esp32s2
-@pytest.mark.esp32s3
-@pytest.mark.esp32c3
+@pytest.mark.supported_targets
 @pytest.mark.generic
 def test_freertos_real_time_stats(dut: Dut) -> None:
 
diff --git a/examples/system/pthread/README.md b/examples/system/pthread/README.md
index 5a87776234..c60b9120b1 100644
--- a/examples/system/pthread/README.md
+++ b/examples/system/pthread/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 |
-| ----------------- | ----- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
 
 # Pthread Example
 
diff --git a/examples/system/pthread/pytest_pthread.py b/examples/system/pthread/pytest_pthread.py
index 020e6ff49b..2852bb1039 100644
--- a/examples/system/pthread/pytest_pthread.py
+++ b/examples/system/pthread/pytest_pthread.py
@@ -5,11 +5,7 @@ import pytest
 from pytest_embedded import Dut
 
 
-# IDF-5054
-@pytest.mark.esp32
-@pytest.mark.esp32s2
-@pytest.mark.esp32s3
-@pytest.mark.esp32c3
+@pytest.mark.supported_targets
 @pytest.mark.generic
 def test_pthread(dut: Dut) -> None: