diff --git a/components/esp_phy/lib b/components/esp_phy/lib
index b526a0d720..8608fcf54d 160000
--- a/components/esp_phy/lib
+++ b/components/esp_phy/lib
@@ -1 +1 @@
-Subproject commit b526a0d7204fb36cb322ead9b1096ffd6a097dc9
+Subproject commit 8608fcf54d51e81f2e74ebf335fa33f61953f7c8
diff --git a/examples/phy/.build-test-rules.yml b/examples/phy/.build-test-rules.yml
index bd914b1c5e..120f460580 100644
--- a/examples/phy/.build-test-rules.yml
+++ b/examples/phy/.build-test-rules.yml
@@ -11,6 +11,6 @@ examples/phy/cert_test:
   disable:
     - if: IDF_TARGET in ["esp32p4"]
       reason: not supported
-    - if: IDF_TARGET == "esp32c5"
+    - if: IDF_TARGET in ["esp32c5", "esp32c61"]
       temporary: true
       reason: not supported yet  # TODO: [ESP32C5] IDF-8851
diff --git a/examples/phy/cert_test/main/cert_test.c b/examples/phy/cert_test/main/cert_test.c
index 4e8e3c0405..323e106554 100644
--- a/examples/phy/cert_test/main/cert_test.c
+++ b/examples/phy/cert_test/main/cert_test.c
@@ -38,7 +38,9 @@ void app_main(void)
     register_phy_cmd();
 
     /* rftest.a requirements */
-    esp_wifi_power_domain_on();
+    #ifndef CONFIG_IDF_TARGET_ESP32H2
+        esp_wifi_power_domain_on();
+    #endif
 
     esp_phy_rftest_config(1);
     esp_phy_rftest_init();
diff --git a/examples/phy/cert_test/sdkconfig.defaults.esp32s3 b/examples/phy/cert_test/sdkconfig.defaults.esp32s3
new file mode 100644
index 0000000000..771824b41e
--- /dev/null
+++ b/examples/phy/cert_test/sdkconfig.defaults.esp32s3
@@ -0,0 +1,4 @@
+#
+# ESP32S3-specific
+#
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096