diff --git a/examples/phy/cert_test/README.md b/examples/phy/cert_test/README.md
index 3ac5021bfd..748bbba0f0 100644
--- a/examples/phy/cert_test/README.md
+++ b/examples/phy/cert_test/README.md
@@ -13,7 +13,7 @@ Before project configuration and build, be sure to set the correct chip target u
 
 ### Hardware Required
 
-* A development board with ESP32-C3/ESP32-S3/ SoC.
+* A development board with ESP32/ESP32-C2/ESP32-C3/ESP32-C6/ESP32-H2/ESP32-S2/ESP32-S3/ SoC.
 * A USB cable for Power supply and programming
 
 ### Configure the project
@@ -34,11 +34,6 @@ Run `idf.py -p PORT flash monitor` to build, flash and monitor the project.
 
 (To exit the serial monitor, type ``Ctrl-]``.)
 
-See the Getting Started Guide for all the steps to configure and use the ESP-IDF to build projects.
-
-* [ESP-IDF Getting Started Guide on ESP32-C3](https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/get-started/index.html)
-* [ESP-IDF Getting Started Guide on ESP32-S3](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/get-started/index.html)
-
 ## Example Output
 
 The command and output logs for each test are as follows:
diff --git a/examples/phy/cert_test/main/cert_test.c b/examples/phy/cert_test/main/cert_test.c
index af5c99ffff..cd8ac2afac 100644
--- a/examples/phy/cert_test/main/cert_test.c
+++ b/examples/phy/cert_test/main/cert_test.c
@@ -1,9 +1,10 @@
 /*
- * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "sdkconfig.h"
 #include "nvs_flash.h"
 
 #include "esp_console.h"
@@ -38,7 +39,7 @@ void app_main(void)
     register_phy_cmd();
 
     /* rftest.a requirements */
-#ifndef CONFIG_IDF_TARGET_ESP32H2
+#if CONFIG_SOC_WIFI_SUPPORTED
     esp_wifi_power_domain_on();
 #endif
 
@@ -46,12 +47,17 @@ void app_main(void)
     esp_phy_rftest_init();
 #endif
 
+    int help_index = 1;
     printf("\n ==================================================\n");
     printf(" |            RF certification test               |\n");
     printf(" |                                                |\n");
     printf(" |  1. Print 'help' to gain overview of commands  |\n");
-    printf(" |  2. Wi-Fi certification test                   |\n");
-    printf(" |  3. Bluetooth certification test               |\n");
+#if CONFIG_SOC_WIFI_SUPPORTED
+    printf(" |  %d. Wi-Fi certification test                   |\n", ++help_index);
+#endif
+#if CONFIG_SOC_BT_SUPPORTED
+    printf(" |  %d. Bluetooth certification test               |\n", ++help_index);
+#endif
     printf(" |                                                |\n");
     printf(" =================================================\n\n");
 
diff --git a/examples/phy/cert_test/main/cmd_phy.c b/examples/phy/cert_test/main/cmd_phy.c
index a21d197a8f..6ed7dd0cf6 100644
--- a/examples/phy/cert_test/main/cmd_phy.c
+++ b/examples/phy/cert_test/main/cmd_phy.c
@@ -3,6 +3,8 @@
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
+
+#include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "esp_log.h"