diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
index 30d47fbba6..2539468823 100644
--- a/examples/system/.build-test-rules.yml
+++ b/examples/system/.build-test-rules.yml
@@ -2,9 +2,6 @@
 
 examples/system/app_trace_basic:
   disable_test:
-    - if: IDF_TARGET == "esp32h21"
-      temporary: true
-      reason: not supported yet #TODO: OCD-1081
     - if: IDF_TARGET == "esp32h4"
       temporary: true
       reason: not supported yet #TODO: OCD-1137
@@ -79,9 +76,6 @@ examples/system/flash_suspend:
 
 examples/system/gcov:
   disable_test:
-    - if: IDF_TARGET == "esp32h21"
-      temporary: true
-      reason: not supported yet #TODO: OCD-1079
     - if: IDF_TARGET == "esp32h4"
       temporary: true
       reason: not supported yet #TODO: OCD-1138
@@ -266,9 +260,6 @@ examples/system/sysview_tracing:
   disable:
     - if: SOC_GPTIMER_SUPPORTED != 1
   disable_test:
-    - if: IDF_TARGET == "esp32h21"
-      temporary: true
-      reason: not supported yet #TODO: OCD-1082
     - if: IDF_TARGET == "esp32h4"
       temporary: true
       reason: not supported yet #TODO: OCD-1136
@@ -283,18 +274,12 @@ examples/system/sysview_tracing_heap_log:
   disable:
     - if: SOC_GPTIMER_SUPPORTED != 1
   disable_test:
-    - if: IDF_TARGET == "esp32h21"
-      temporary: true
-      reason: not supported yet #TODO: OCD-1082
     - if: IDF_TARGET == "esp32h4"
       temporary: true
       reason: not supported yet #TODO: OCD-1136
     - if: IDF_TARGET == "esp32s31"
       temporary: true
       reason: not support yet   #TODO: OCD-1289
-    - if: IDF_TARGET == "esp32p4"
-      temporary: true
-      reason: lack of eco6 runners
   depends_components:
     - esp_trace
     - app_trace
diff --git a/examples/system/app_trace_basic/pytest_app_trace_basic.py b/examples/system/app_trace_basic/pytest_app_trace_basic.py
index dab8c1b9a7..69104e64ad 100644
--- a/examples/system/app_trace_basic/pytest_app_trace_basic.py
+++ b/examples/system/app_trace_basic/pytest_app_trace_basic.py
@@ -55,9 +55,10 @@ def test_examples_app_trace_basic(openocd_dut: 'OpenOCD', dut: IdfDut) -> None:
 @pytest.mark.usb_serial_jtag
 @idf_parametrize('config', ['apptrace_jtag'], indirect=['config'])
 @idf_parametrize(
-    'target', ['esp32s3', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32h2', 'esp32p4'], indirect=['target']
+    'target',
+    ['esp32s3', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32h2', 'esp32p4', 'esp32h21'],
+    indirect=['target'],
 )
-@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of eco6 runners')
 def test_examples_app_trace_basic_usj(openocd_dut: 'OpenOCD', dut: IdfDut) -> None:
     _test_examples_app_trace_basic(openocd_dut, dut)
 
diff --git a/examples/system/gcov/pytest_gcov.py b/examples/system/gcov/pytest_gcov.py
index 6b3d2fdf3c..120beab663 100644
--- a/examples/system/gcov/pytest_gcov.py
+++ b/examples/system/gcov/pytest_gcov.py
@@ -151,9 +151,10 @@ def test_gcov(openocd_dut: 'OpenOCD', dut: IdfDut) -> None:
 @pytest.mark.usb_serial_jtag
 @idf_parametrize('config', ['gcov_jtag'], indirect=['config'])
 @idf_parametrize(
-    'target', ['esp32s3', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32h2', 'esp32p4'], indirect=['target']
+    'target',
+    ['esp32s3', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32h2', 'esp32p4', 'esp32h21'],
+    indirect=['target'],
 )
-@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of eco6 runners')
 def test_gcov_usj(openocd_dut: 'OpenOCD', dut: IdfDut) -> None:
     _test_gcov(openocd_dut, dut)
 
diff --git a/examples/system/sysview_tracing/pytest_sysview_tracing.py b/examples/system/sysview_tracing/pytest_sysview_tracing.py
index 9ec4b78eba..df48afb8f6 100644
--- a/examples/system/sysview_tracing/pytest_sysview_tracing.py
+++ b/examples/system/sysview_tracing/pytest_sysview_tracing.py
@@ -139,9 +139,10 @@ def test_sysview_tracing_jtag(openocd_dut: 'OpenOCD', dut: IdfDut) -> None:
 @pytest.mark.usb_serial_jtag
 @idf_parametrize('config', ['sysview_jtag'], indirect=['config'])
 @idf_parametrize(
-    'target', ['esp32s3', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32h2', 'esp32p4'], indirect=['target']
+    'target',
+    ['esp32s3', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32h2', 'esp32p4', 'esp32h21'],
+    indirect=['target'],
 )
-@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of eco6 runners')
 def test_sysview_tracing_usj(openocd_dut: 'OpenOCD', dut: IdfDut) -> None:
     _test_sysview_tracing_jtag(openocd_dut, dut)
 
diff --git a/examples/system/sysview_tracing_heap_log/pytest_sysview_tracing_heap_log.py b/examples/system/sysview_tracing_heap_log/pytest_sysview_tracing_heap_log.py
index b5a059180d..e16a4c4880 100644
--- a/examples/system/sysview_tracing_heap_log/pytest_sysview_tracing_heap_log.py
+++ b/examples/system/sysview_tracing_heap_log/pytest_sysview_tracing_heap_log.py
@@ -74,6 +74,10 @@ def test_examples_sysview_tracing_heap_log(openocd_dut: 'OpenOCD', idf_path: str
 
 @pytest.mark.parametrize('config', ['app_trace_jtag'], indirect=True)
 @pytest.mark.usb_serial_jtag
-@idf_parametrize('target', ['esp32s3', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32h2'], indirect=['target'])
+@idf_parametrize(
+    'target',
+    ['esp32s3', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32h2', 'esp32p4', 'esp32h21'],
+    indirect=['target'],
+)
 def test_examples_sysview_tracing_heap_log_usj(openocd_dut: 'OpenOCD', idf_path: str, dut: IdfDut) -> None:
     _test_examples_sysview_tracing_heap_log(openocd_dut, idf_path, dut)