diff --git a/tools/test_apps/system/.build-test-rules.yml b/tools/test_apps/system/.build-test-rules.yml
index 2ba0ae1788..ee153cc1f9 100644
--- a/tools/test_apps/system/.build-test-rules.yml
+++ b/tools/test_apps/system/.build-test-rules.yml
@@ -74,11 +74,7 @@ tools/test_apps/system/no_embedded_paths:
 
 tools/test_apps/system/panic:
   enable:
-    - if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["esp32p4"] # preview targets
-  disable:
-    - if: IDF_TARGET == "esp32c61"
-      temporary: true
-      reason: not supported  # TODO: [ESP32c61] IDF-9268
+    - if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["esp32p4", "esp32c61"] # preview targets
 
 tools/test_apps/system/ram_loadable_app:
   disable:
diff --git a/tools/test_apps/system/panic/README.md b/tools/test_apps/system/panic/README.md
index 5d7a8ffa16..2f33ebe37f 100644
--- a/tools/test_apps/system/panic/README.md
+++ b/tools/test_apps/system/panic/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # Introduction
 
diff --git a/tools/test_apps/system/panic/pytest_panic.py b/tools/test_apps/system/panic/pytest_panic.py
index 8d4dc0384f..aa615fdd30 100644
--- a/tools/test_apps/system/panic/pytest_panic.py
+++ b/tools/test_apps/system/panic/pytest_panic.py
@@ -53,8 +53,9 @@ CONFIGS = [
     pytest.param('coredump_uart_bin_crc', marks=TARGETS_ALL),
     pytest.param('coredump_uart_elf_crc', marks=TARGETS_ALL),
     pytest.param('coredump_flash_custom_stack', marks=TARGETS_RISCV),
-    pytest.param('gdbstub', marks=TARGETS_ALL),
-    pytest.param('panic', marks=TARGETS_ALL),
+    # TODO: Move esp32c61 to TARGETS_RISCV once Core Dump is supported (IDF-9268)
+    pytest.param('gdbstub', marks=TARGETS_ALL + [pytest.mark.esp32c61]),
+    pytest.param('panic', marks=TARGETS_ALL + [pytest.mark.esp32c61]),
 ]
 
 CONFIGS_DUAL_CORE = [
@@ -83,6 +84,7 @@ CONFIGS_HW_STACK_GUARD = [
     pytest.param('coredump_flash_bin_crc', marks=TARGETS_RISCV),
     pytest.param('coredump_uart_bin_crc', marks=TARGETS_RISCV),
     pytest.param('coredump_uart_elf_crc', marks=TARGETS_RISCV),
+    # TODO: Add stack guard support to the ESP32-C61: IDF-9269
     pytest.param('gdbstub', marks=TARGETS_RISCV),
     pytest.param('panic', marks=TARGETS_RISCV),
 ]
@@ -585,7 +587,6 @@ def cache_error_log_check(dut: PanicTestDut) -> None:
 
 @pytest.mark.generic
 @pytest.mark.supported_targets
-@pytest.mark.temp_skip_ci(targets=['esp32c61'], reason='support TBD')  # TODO [ESP32C61] IDF-9268 IDF-10994
 @pytest.mark.parametrize('config', ['panic'], indirect=True)
 def test_assert_cache_write_back_error_can_print_backtrace(
     dut: PanicTestDut, config: str, test_func_name: str
@@ -596,7 +597,6 @@ def test_assert_cache_write_back_error_can_print_backtrace(
 
 @pytest.mark.generic
 @pytest.mark.supported_targets
-@pytest.mark.temp_skip_ci(targets=['esp32c61'], reason='support TBD')  # TODO [ESP32C61] IDF-9268 IDF-10994
 @pytest.mark.parametrize('config', ['panic'], indirect=True)
 def test_assert_cache_write_back_error_can_print_backtrace2(
     dut: PanicTestDut, config: str, test_func_name: str
diff --git a/tools/test_apps/system/panic/sdkconfig.ci.memprot_esp32c61 b/tools/test_apps/system/panic/sdkconfig.ci.memprot_esp32c61
new file mode 100644
index 0000000000..97235c12a2
--- /dev/null
+++ b/tools/test_apps/system/panic/sdkconfig.ci.memprot_esp32c61
@@ -0,0 +1,8 @@
+# Restricting to ESP32C61
+CONFIG_IDF_TARGET="esp32c61"
+
+# Enabling memory protection
+CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT=y
+
+# Enable memprot test
+CONFIG_TEST_MEMPROT=y