diff --git a/templates/110_filesys-cores.yaml.tt2 b/templates/110_filesys-cores.yaml.tt2
index 59fae21..9052bc0 100644
--- a/templates/110_filesys-cores.yaml.tt2
+++ b/templates/110_filesys-cores.yaml.tt2
@@ -13,3 +13,19 @@ command:
     stdout:
     - "!/^core\\..+/"
     stderr: []
+
+file:
+  /var/lib/systemd/coredump:
+    exists: true
+    mode: "0755"
+    owner: root
+    group: root
+    filetype: directory
+    contains: []
+
+command:
+  "ls /var/lib/systemd/coredump/":
+    exit-status: 0
+    stdout:
+    - "!/^core\\..+/"
+    stderr: []
diff --git a/templates/610_kernel-sysctl-params.yaml.tt2 b/templates/610_kernel-sysctl-params.yaml.tt2
index 8a720e5..ab973c4 100644
--- a/templates/610_kernel-sysctl-params.yaml.tt2
+++ b/templates/610_kernel-sysctl-params.yaml.tt2
@@ -4,7 +4,7 @@ kernel-param:
     value: "1"
 
   kernel.core_pattern:
-    value: "/var/cores/core-%e-%s-%u-%g-%p-%t"
+    value: "|/lib/systemd/systemd-coredump %P %u %g %s %t 9223372036854775808 %e"
 
   fs.suid_dumpable:
     value: "2"
diff --git a/testrunner b/testrunner
index b124ace..2eebb53 100755
--- a/testrunner
+++ b/testrunner
@@ -9,6 +9,7 @@ diag() {
 }
 
 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.
   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*"