diff --git a/tools/test_apps/system/panic/pytest_panic.py b/tools/test_apps/system/panic/pytest_panic.py
index 28f541cfa1..6f37f36ef0 100644
--- a/tools/test_apps/system/panic/pytest_panic.py
+++ b/tools/test_apps/system/panic/pytest_panic.py
@@ -1066,11 +1066,11 @@ def test_tcb_corrupted(dut: PanicTestDut, target: str, config: str, test_func_na
     dut.run_test_func(test_func_name)
     if dut.is_xtensa:
         dut.expect_gme('LoadProhibited')
-        dut.expect_reg_dump(0)
+        dut.expect_reg_dump()
         dut.expect_backtrace()
     else:
         dut.expect_gme('Load access fault')
-        dut.expect_reg_dump(0)
+        dut.expect_reg_dump()
         dut.expect_stack_dump()
 
     dut.expect_elf_sha256()
diff --git a/tools/test_apps/system/panic/test_panic_util/panic_dut.py b/tools/test_apps/system/panic/test_panic_util/panic_dut.py
index b19b32d539..2619008fe0 100644
--- a/tools/test_apps/system/panic/test_panic_util/panic_dut.py
+++ b/tools/test_apps/system/panic/test_panic_util/panic_dut.py
@@ -96,9 +96,13 @@ class PanicTestDut(IdfDut):
         """Expect method for Guru Meditation Errors"""
         self.expect_exact(f"Guru Meditation Error: Core  0 panic'ed ({reason})")
 
-    def expect_reg_dump(self, core: int = 0) -> None:
-        """Expect method for the register dump"""
-        self.expect(r'Core\s+%d register dump:' % core)
+    def expect_reg_dump(self, core: Optional[int] = None) -> None:
+        if core is None:
+            # Match any core num
+            self.expect(r'Core\s+\d+\s+register dump:')
+        else:
+            # Match the exact core num provided
+            self.expect(r'Core\s+%d\s+register dump:' % core)
 
     def expect_cpu_reset(self) -> None:
         # no digital system reset for panic handling restarts (see IDF-7255)