diff --git a/testrunner b/testrunner
index 2eebb53..ae62c1a 100755
--- a/testrunner
+++ b/testrunner
@@ -8,17 +8,16 @@ diag() {
   echo "$@" 2>&1
 }
 
-if ls /var/cores/core.perl-fcgi.sig11* >/dev/null 2>&1 ; then
-  # It has to be improved for systemd-coredump, while I don't know yet how new core will looks like.
+if ls /var/lib/systemd/coredump/core.perl-fcgi.* >/dev/null 2>&1 ; then
   diag "================== NOTE: CORE DUMP DETECTED =================="
   diag "= Removing known cores to prevent failing for the known issues:"
-  diag "= 1) MT#21791: Renaming ngcp-panel cores /var/cores/core.perl-fcgi.sig11*"
-  ls -la /var/cores/core.perl-fcgi.sig11*
-  for file in /var/cores/core.perl-fcgi.sig11* ; do
-    mv "${file}" /var/cores/RENAMED_"$(basename "${file}")"
+  diag "= 1) MT#21791: Renaming ngcp-panel cores /var/lib/systemd/coredump/core.perl-fcgi.*"
+  ls -la /var/lib/systemd/coredump/core.perl-fcgi.*
+  for file in /var/lib/systemd/coredump/core.perl-fcgi.* ; do
+    mv "${file}" /var/lib/systemd/coredump/RENAMED_"$(basename "${file}")"
   done
   diag "= New cores names are:"
-  ls -la /var/cores/RENAMED_core.perl-fcgi.sig11*
+  ls -la /var/lib/systemd/coredump/RENAMED_core.perl-fcgi.*
   diag "========================== DONE =============================="
 fi