diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
index 3152b243fd..ec61479228 100644
--- a/examples/system/.build-test-rules.yml
+++ b/examples/system/.build-test-rules.yml
@@ -173,14 +173,8 @@ examples/system/ota/native_ota_example:
     - protocol_examples_common
 
 examples/system/ota/otatool:
-  disable:
-    - if: IDF_TARGET in ["esp32h2"]
-      temporary: true
-      reason: target esp32h2 is not supported yet
-  disable_test:
-    - if: IDF_TARGET in ["esp32c61"]
-      reason: target esp32c61 is not supported yet
-
+  enable:
+    - if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["esp32c5", "esp32c61"]
 
 examples/system/ota/pre_encrypted_ota:
   disable:
diff --git a/examples/system/ota/otatool/README.md b/examples/system/ota/otatool/README.md
index 255b223200..859fb55977 100644
--- a/examples/system/ota/otatool/README.md
+++ b/examples/system/ota/otatool/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # OTA Tool Example
 
diff --git a/examples/system/ota/otatool/pytest_otatool.py b/examples/system/ota/otatool/pytest_otatool.py
index 8a9d0b21af..c077034736 100644
--- a/examples/system/ota/otatool/pytest_otatool.py
+++ b/examples/system/ota/otatool/pytest_otatool.py
@@ -26,14 +26,7 @@ def _real_test_func(dut: Dut) -> None:
     subprocess.check_call([sys.executable, script_path, '--binary', binary_path])
 
 
-@pytest.mark.esp32
-@pytest.mark.esp32s2
-@pytest.mark.esp32c3
-@pytest.mark.esp32s3
-@pytest.mark.esp32c5
-# @pytest.mark.esp32c61 #IDF-11309
-@pytest.mark.esp32c6
-@pytest.mark.esp32p4
+@pytest.mark.supported_targets
 @pytest.mark.generic
 def test_otatool_example(dut: Dut) -> None:
     _real_test_func(dut)