diff --git a/examples/openthread/.build-test-rules.yml b/examples/openthread/.build-test-rules.yml
index 0ad7d9b1a8..51217281f9 100644
--- a/examples/openthread/.build-test-rules.yml
+++ b/examples/openthread/.build-test-rules.yml
@@ -21,10 +21,8 @@
     - esp_hw_support
 
 examples/openthread/ot_br:
-  disable:
-    - if: IDF_TARGET in ["esp32h2", "esp32p4"]
-      temporary: true
-      reason: target(s) not supported yet
+  enable:
+    - if: SOC_WIFI_SUPPORTED == 1
   disable_test:
     - if: IDF_TARGET in ["esp32", "esp32c3", "esp32c2", "esp32c6", "esp32s2"]
       temporary: true
@@ -47,11 +45,8 @@ examples/openthread/ot_rcp:
 
 examples/openthread/ot_sleepy_device/deep_sleep:
   enable:
-    - if: IDF_TARGET in ["esp32h2"]
-  disable_test:
-    - if: IDF_TARGET == "esp32h2"
-      temporary: true
-      reason: Unsupport
+    - if: SOC_IEEE802154_SUPPORTED == 1
+  <<: [*openthread_dependencies, *openthread_sleep_dependencies]
 
 examples/openthread/ot_sleepy_device/light_sleep:
   enable:
diff --git a/examples/openthread/ot_sleepy_device/deep_sleep/README.md b/examples/openthread/ot_sleepy_device/deep_sleep/README.md
index 5ee3f7d9b2..211570037a 100644
--- a/examples/openthread/ot_sleepy_device/deep_sleep/README.md
+++ b/examples/openthread/ot_sleepy_device/deep_sleep/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H2 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-C6 | ESP32-H2 |
+| ----------------- | -------- | -------- |
 
 # OpenThread Sleepy Device Example
 
diff --git a/examples/zigbee/.build-test-rules.yml b/examples/zigbee/.build-test-rules.yml
index bd0f8f99ec..d733dc017f 100644
--- a/examples/zigbee/.build-test-rules.yml
+++ b/examples/zigbee/.build-test-rules.yml
@@ -6,22 +6,19 @@
     - examples/zigbee/light_sample/**/*
 
 examples/zigbee/esp_zigbee_gateway:
-  disable:
-    - if: IDF_TARGET in ["esp32c2", "esp32h2", "esp32p4"]
-      temporary: true
-      reason: target(s) not supported yet
+  enable:
+    - if: SOC_WIFI_SUPPORTED == 1 and IDF_TARGET != "esp32c2"
+      reason: not supported esp32c2
   <<: *zigbee_dependencies
 
 examples/zigbee/esp_zigbee_rcp:
   enable:
-    - if: IDF_TARGET in ["esp32c6", "esp32h2"]
-      reason: should able to run on esp32h2 and esp32c6
+    - if: SOC_IEEE802154_SUPPORTED == 1
   <<: *zigbee_dependencies
 
 examples/zigbee/light_sample:
   enable:
-    - if: IDF_TARGET in ["esp32c6", "esp32h2"]
-      reason: should able to run on esp32h2 and esp32c6
+    - if: SOC_IEEE802154_SUPPORTED == 1
   disable_test:
     - if: IDF_TARGET == "esp32c6"
       temporary: true