diff --git a/components/espcoredump/Kconfig b/components/espcoredump/Kconfig
index d95090c743..c19b0eabba 100644
--- a/components/espcoredump/Kconfig
+++ b/components/espcoredump/Kconfig
@@ -50,8 +50,7 @@ menu "Core dump"
     config ESP_COREDUMP_CAPTURE_DRAM
         bool "Include whole .bss and .data sections and heap data into core dump file"
         default n
-        #TODO: Heap walker api is not ready for the esp32c5 (IDF-9641)
-        depends on ESP_COREDUMP_DATA_FORMAT_ELF && !IDF_TARGET_ESP32C5
+        depends on ESP_COREDUMP_DATA_FORMAT_ELF
         help
             Storing these sections can help with easier debugging and troubleshooting.
             However, additional storage space will be required in the core dump partition.
diff --git a/tools/test_apps/system/panic/pytest_panic.py b/tools/test_apps/system/panic/pytest_panic.py
index 698dd4eb22..08cfb08e15 100644
--- a/tools/test_apps/system/panic/pytest_panic.py
+++ b/tools/test_apps/system/panic/pytest_panic.py
@@ -26,6 +26,7 @@ TARGETS_XTENSA = TARGETS_XTENSA_SINGLE_CORE + TARGETS_XTENSA_DUAL_CORE
 TARGETS_RISCV_SINGLE_CORE = [
     pytest.mark.esp32c2,
     pytest.mark.esp32c3,
+    pytest.mark.esp32c5,
     pytest.mark.esp32c6,
     pytest.mark.esp32h2,
 ]
@@ -974,6 +975,7 @@ def test_hw_stack_guard_cpu(dut: PanicTestDut, cpu: int) -> None:
     assert end_addr > start_addr
 
 
+@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='TODO: IDF-8662')
 @pytest.mark.parametrize('config', CONFIGS_HW_STACK_GUARD, indirect=True)
 @pytest.mark.generic
 def test_hw_stack_guard_cpu0(dut: PanicTestDut, config: str, test_func_name: str) -> None:
@@ -982,6 +984,7 @@ def test_hw_stack_guard_cpu0(dut: PanicTestDut, config: str, test_func_name: str
     common_test(dut, config)
 
 
+@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='TODO: IDF-8662')
 @pytest.mark.parametrize('config', CONFIGS_HW_STACK_GUARD_DUAL_CORE, indirect=True)
 @pytest.mark.generic
 def test_hw_stack_guard_cpu1(dut: PanicTestDut, config: str, test_func_name: str) -> None: