diff --git a/components/esp_system/CMakeLists.txt b/components/esp_system/CMakeLists.txt
index 85f66a6cc6..f2fff07446 100644
--- a/components/esp_system/CMakeLists.txt
+++ b/components/esp_system/CMakeLists.txt
@@ -26,10 +26,6 @@ else()
             "xt_wdt.c"
             "debug_stubs.c")
 
-    if(NOT (${target} STREQUAL "esp32c2"))
-        list(APPEND srcs "debug_stubs.c")
-    endif()
-
     if(CONFIG_ESP_SYSTEM_USE_EH_FRAME)
         list(APPEND srcs "eh_frame_parser.c")
     endif()
diff --git a/components/esp_system/port/soc/esp32c2/CMakeLists.txt b/components/esp_system/port/soc/esp32c2/CMakeLists.txt
index 06734055f0..d77109f3b5 100644
--- a/components/esp_system/port/soc/esp32c2/CMakeLists.txt
+++ b/components/esp_system/port/soc/esp32c2/CMakeLists.txt
@@ -4,7 +4,9 @@ set(srcs "clk.c"
          "cache_err_int.c"
          "../../arch/riscv/expression_with_stack.c"
          "../../arch/riscv/expression_with_stack_asm.S"
-         "../../arch/riscv/panic_arch.c")
+         "../../arch/riscv/panic_arch.c"
+         "../../arch/riscv/debug_stubs.c")
+
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" ${srcs})
 
 target_sources(${COMPONENT_LIB} PRIVATE ${srcs})
diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
index 77122a71d3..f18ed8b4e3 100644
--- a/examples/system/.build-test-rules.yml
+++ b/examples/system/.build-test-rules.yml
@@ -75,12 +75,8 @@ examples/system/flash_suspend:
       reason: the other targets are not tested yet
 
 examples/system/gcov:
-  enable:
-    - if: IDF_TARGET in ["esp32", "esp32s2"]
-      temporary: true
-      reason: the other targets are not tested yet
   disable_test:
-    - if: IDF_TARGET == "esp32s2"
+    - if: IDF_TARGET != "esp32"
       temporary: true
       reason: lack of runners
 
diff --git a/examples/system/gcov/README.md b/examples/system/gcov/README.md
index 1aeaee631a..9108c66ada 100644
--- a/examples/system/gcov/README.md
+++ b/examples/system/gcov/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-S2 |
-| ----------------- | ----- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
 
 # Blink Example With Coverage Info (Gcov)
 
@@ -19,7 +19,7 @@ This example implements a simple blink application but with code coverage enable
 To run this example, you need a supported dev board connected to a JTAG adapter, which can come in the following forms:
 
 * [ESP-WROVER-KIT](https://docs.espressif.com/projects/esp-idf/en/latest/hw-reference/modules-and-boards.html#esp-wrover-kit-v4-1) which integrates an on-board JTAG adapter. Ensure that the [required jumpers to enable JTAG are connected](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/get-started-wrover-kit.html#setup-options) on the WROVER-KIT.
-* ESP32 or ESP32-S2 core board (e.g. ESP32-DevKitC, [ESP32-S2-Saola-1](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-saola-1-v1.2.html)) can also work as long as you connect it to an external JTAG adapter (e.g. FT2232H, J-LINK).
+* ESP core board (e.g. ESP32-DevKitC) can also work as long as you connect it to an external JTAG adapter (e.g. FT2232H, J-LINK).
 
 This example will assume that that an ESP-WROVER-KIT is used.
 
diff --git a/examples/system/gcov/main/Kconfig.projbuild b/examples/system/gcov/main/Kconfig.projbuild
index 2be1f9f0fd..a5ff55cf83 100644
--- a/examples/system/gcov/main/Kconfig.projbuild
+++ b/examples/system/gcov/main/Kconfig.projbuild
@@ -5,7 +5,7 @@ menu "Example Configuration"
     config BLINK_GPIO
         int "Blink GPIO number"
         range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
-        default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32H2
+        default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C2
         default 18 if IDF_TARGET_ESP32S2
         default 48 if IDF_TARGET_ESP32S3
         default 5