diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
index dd7ee32fb88..144ccbbdad4 100644
--- a/examples/system/.build-test-rules.yml
+++ b/examples/system/.build-test-rules.yml
@@ -7,10 +7,7 @@ examples/system/app_trace_basic:
       reason: lack of runners
     - if: IDF_TARGET == "esp32h4"
       temporary: true
-      reason: not supported yet #TODO: OCD-1137
-    - if: IDF_TARGET == "esp32s31"
-      temporary: true
-      reason: not support yet   #TODO: OCD-1290
+      reason: lack of runners
   depends_components:
     - esp_trace
     - app_trace
@@ -74,9 +71,6 @@ examples/system/esp_trace:
     - if: IDF_TARGET == "esp32h4"
       temporary: true
       reason: lack of runners
-    - if: IDF_TARGET == "esp32s31"
-      temporary: true
-      reason: lack of runners
   depends_components:
     - esp_trace
     - freertos
@@ -102,10 +96,7 @@ examples/system/gcov:
       reason: lack of runners
     - if: IDF_TARGET == "esp32h4"
       temporary: true
-      reason: not supported yet #TODO: OCD-1138
-    - if: IDF_TARGET == "esp32s31"
-      temporary: true
-      reason: not support yet   #TODO: OCD-1291
+      reason: lack of runners
   depends_components:
     - esp_trace
     - app_trace
@@ -287,9 +278,9 @@ examples/system/sysview_tracing:
     - if: IDF_TARGET == "esp32h21"
       temporary: true
       reason: lack of runners
-    - if: IDF_TARGET == "esp32s31"
+    - if: IDF_TARGET == "esp32h4"
       temporary: true
-      reason: not support yet   #TODO: OCD-1289
+      reason: lack of runners
   depends_components:
     - esp_trace
     - app_trace
@@ -303,10 +294,7 @@ examples/system/sysview_tracing_heap_log:
       reason: lack of runners
     - 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
+      reason: lack of 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 5d8b5a94759..ef7a7df9336 100644
--- a/examples/system/app_trace_basic/pytest_app_trace_basic.py
+++ b/examples/system/app_trace_basic/pytest_app_trace_basic.py
@@ -8,6 +8,7 @@ import pytest
 import serial
 from pytest_embedded_idf import IdfDut
 from pytest_embedded_idf.utils import idf_parametrize
+from pytest_embedded_idf.utils import soc_filtered_targets
 
 if typing.TYPE_CHECKING:
     from conftest import OpenOCD
@@ -54,9 +55,8 @@ 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']
-)
+@idf_parametrize('target', soc_filtered_targets('SOC_USB_SERIAL_JTAG_SUPPORTED == 1'), indirect=['target'])
+@pytest.mark.temp_skip_ci(targets=['esp32h4'], reason='lack of runner # TODO: IDFCI-10703')
 def test_examples_app_trace_basic_usj(openocd_dut: 'OpenOCD', dut: IdfDut) -> None:
     _test_examples_app_trace_basic(openocd_dut, dut)
 
@@ -64,7 +64,7 @@ def test_examples_app_trace_basic_usj(openocd_dut: 'OpenOCD', dut: IdfDut) -> No
 @pytest.mark.generic
 @idf_parametrize('config', ['apptrace_uart'], indirect=['config'])
 @idf_parametrize('target', ['supported_targets'], indirect=['target'])
-@pytest.mark.temp_skip_ci(targets=['esp32s31', 'esp32h4'], reason='bringup on this module is not done')
+@pytest.mark.temp_skip_ci(targets=['esp32h4'], reason='lack of runner # TODO: IDFCI-10703')
 def test_examples_app_trace_basic_uart(dut: IdfDut) -> None:
     dut.serial.close()
     with serial.Serial(dut.serial.port, baudrate=1000000, timeout=3) as ser:
diff --git a/examples/system/esp_trace/pytest_esp_trace.py b/examples/system/esp_trace/pytest_esp_trace.py
index e5bc2a0af85..d1f031f5201 100644
--- a/examples/system/esp_trace/pytest_esp_trace.py
+++ b/examples/system/esp_trace/pytest_esp_trace.py
@@ -102,7 +102,7 @@ def _capture_trace(ser: serial.Serial, trace_log_path: str, capture_s: float = 5
 @pytest.mark.usb_serial_jtag
 @idf_parametrize('target', soc_filtered_targets('SOC_USB_SERIAL_JTAG_SUPPORTED == 1'), indirect=['target'])
 @pytest.mark.parametrize('config', [pytest.param('default')], indirect=True)
-@pytest.mark.temp_skip_ci(targets=['esp32h4', 'esp32s31'], reason='lack of runner # TODO: IDFCI-10703')
+@pytest.mark.temp_skip_ci(targets=['esp32h4'], reason='lack of runner # TODO: IDFCI-10703')
 def test_esp_trace_ext_lib_usj(dut: IdfDut) -> None:
     dut.expect('Start of trace session', timeout=5)
 
diff --git a/examples/system/gcov/pytest_gcov.py b/examples/system/gcov/pytest_gcov.py
index 10c37b7138e..04a39d325e8 100644
--- a/examples/system/gcov/pytest_gcov.py
+++ b/examples/system/gcov/pytest_gcov.py
@@ -8,6 +8,7 @@ import typing
 import pytest
 from pytest_embedded_idf import IdfDut
 from pytest_embedded_idf.utils import idf_parametrize
+from pytest_embedded_idf.utils import soc_filtered_targets
 
 if typing.TYPE_CHECKING:
     from conftest import OpenOCD
@@ -150,9 +151,8 @@ 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']
-)
+@idf_parametrize('target', soc_filtered_targets('SOC_USB_SERIAL_JTAG_SUPPORTED == 1'), indirect=['target'])
+@pytest.mark.temp_skip_ci(targets=['esp32h4'], reason='lack of runner # TODO: IDFCI-10703')
 def test_gcov_usj(openocd_dut: 'OpenOCD', dut: IdfDut) -> None:
     _test_gcov(openocd_dut, dut)
 
@@ -198,6 +198,6 @@ def _test_gcov_uart(dut: IdfDut) -> None:
 @pytest.mark.generic
 @idf_parametrize('config', ['gcov_uart'], indirect=['config'])
 @idf_parametrize('target', ['supported_targets'], indirect=['target'])
-@pytest.mark.temp_skip_ci(targets=['esp32s31', 'esp32h4'], reason='bringup on this module is not done')
+@pytest.mark.temp_skip_ci(targets=['esp32h4'], reason='lack of runner # TODO: IDFCI-10703')
 def test_gcov_uart(dut: IdfDut) -> None:
     _test_gcov_uart(dut)
diff --git a/examples/system/sysview_tracing/pytest_sysview_tracing.py b/examples/system/sysview_tracing/pytest_sysview_tracing.py
index ac8d9b52d70..f60091384d4 100644
--- a/examples/system/sysview_tracing/pytest_sysview_tracing.py
+++ b/examples/system/sysview_tracing/pytest_sysview_tracing.py
@@ -140,7 +140,7 @@ def test_sysview_tracing_jtag(openocd_dut: 'OpenOCD', dut: IdfDut) -> None:
 @idf_parametrize('config', ['sysview_jtag'], indirect=['config'])
 @idf_parametrize(
     'target',
-    ['esp32s3', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32h2', 'esp32p4', 'esp32h4'],
+    soc_filtered_targets('SOC_USB_SERIAL_JTAG_SUPPORTED == 1'),
     indirect=['target'],
 )
 @pytest.mark.temp_skip_ci(targets=['esp32h4'], reason='lack of runner # TODO: IDFCI-10703')
@@ -160,7 +160,7 @@ def _test_sysview_tracing_uart(dut: IdfDut) -> None:
 @pytest.mark.generic
 @idf_parametrize('config', ['sysview_uart'], indirect=['config'])
 @idf_parametrize('target', ['supported_targets'], indirect=['target'])
-@pytest.mark.temp_skip_ci(targets=['esp32s31'], reason='bringup on this module is not done')
+@pytest.mark.temp_skip_ci(targets=['esp32h4'], reason='lack of runner # TODO: IDFCI-10703')
 def test_sysview_tracing_uart(dut: IdfDut) -> None:
     _test_sysview_tracing_uart(dut)
 
@@ -176,7 +176,7 @@ def test_sysview_tracing_uart_c2(dut: IdfDut) -> None:
 @pytest.mark.usb_serial_jtag
 @idf_parametrize('target', soc_filtered_targets('SOC_USB_SERIAL_JTAG_SUPPORTED == 1'), indirect=['target'])
 @pytest.mark.parametrize('config', [pytest.param('sysview_usj')], indirect=True)
-@pytest.mark.temp_skip_ci(targets=['esp32h4', 'esp32s31'], reason='lack of runner # TODO: IDFCI-10703')
+@pytest.mark.temp_skip_ci(targets=['esp32h4'], reason='lack of runner # TODO: IDFCI-10703')
 def test_sysview_tracing_usj_serial(dut: IdfDut) -> None:
     time.sleep(1)  # wait for USJ port to be ready
     usj_port = '/dev/serial_ports/ttyACM-esp32'
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 9a1f1312040..1ee4ebcfd86 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
@@ -8,6 +8,7 @@ import pexpect.fdpexpect
 import pytest
 from pytest_embedded_idf import IdfDut
 from pytest_embedded_idf.utils import idf_parametrize
+from pytest_embedded_idf.utils import soc_filtered_targets
 
 if typing.TYPE_CHECKING:
     from conftest import OpenOCD
@@ -76,8 +77,9 @@ def test_examples_sysview_tracing_heap_log(openocd_dut: 'OpenOCD', idf_path: str
 @pytest.mark.usb_serial_jtag
 @idf_parametrize(
     'target',
-    ['esp32s3', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32h2', 'esp32p4'],
+    soc_filtered_targets('SOC_USB_SERIAL_JTAG_SUPPORTED == 1'),
     indirect=['target'],
 )
+@pytest.mark.temp_skip_ci(targets=['esp32h4'], reason='lack of runner # TODO: IDFCI-10703')
 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)