diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
index 5d0215c970..df7f97d3fa 100644
--- a/examples/system/.build-test-rules.yml
+++ b/examples/system/.build-test-rules.yml
@@ -2,9 +2,15 @@
 
 examples/system/app_trace_basic:
   disable_test:
-    - if: IDF_TARGET in ["esp32p4", "esp32h21"]
+    - if: IDF_TARGET == "esp32p4"
       temporary: true
       reason: lack of runners.
+    - 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
 
 examples/system/base_mac_address:
   depends_components:
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 c53644f024..004e07632b 100644
--- a/examples/system/app_trace_basic/pytest_app_trace_basic.py
+++ b/examples/system/app_trace_basic/pytest_app_trace_basic.py
@@ -131,8 +131,8 @@ def _test_examples_app_trace_basic(dut: IdfDut) -> None:
         with open(openocd.log_file, encoding='utf-8') as oocd_log:  # pylint: disable=protected-access
             cores = 1 if dut.app.sdkconfig.get('ESP_SYSTEM_SINGLE_CORE_MODE') is True else 2
             search_strings.append('App trace params: from {} cores,'.format(cores))
-            found = False
             for search_str in search_strings:
+                found = False
                 oocd_log.seek(0)
                 for line in oocd_log:
                     if search_str in line: