diff --git a/templates/110_filesys-cores.yaml.tt2 b/templates/110_filesys-cores.yaml.tt2
new file mode 100644
index 0000000..59fae21
--- /dev/null
+++ b/templates/110_filesys-cores.yaml.tt2
@@ -0,0 +1,15 @@
+file:
+  /var/cores:
+    exists: true
+    mode: "1777"
+    owner: root
+    group: root
+    filetype: directory
+    contains: []
+
+command:
+  "ls /var/cores/":
+    exit-status: 0
+    stdout:
+    - "!/^core\\..+/"
+    stderr: []
diff --git a/templates/110_filesys-no-cores.yaml.tt2 b/templates/110_filesys-no-cores.yaml.tt2
deleted file mode 100644
index 173dedf..0000000
--- a/templates/110_filesys-no-cores.yaml.tt2
+++ /dev/null
@@ -1,6 +0,0 @@
-command:
-  "ls -la /var/cores/core.*":
-    exit-status: 2
-    stdout: []
-    stderr:
-      - "/ls: cannot access '??/var/cores/core.*'??: No such file or directory/"
diff --git a/templates/goss.yaml.tt2 b/templates/goss.yaml.tt2
index 3f80e53..1a63981 100644
--- a/templates/goss.yaml.tt2
+++ b/templates/goss.yaml.tt2
@@ -1,6 +1,6 @@
 gossfile:
   000_self-test-command.yaml: {}
-  110_filesys-no-cores.yaml: {}
+  110_filesys-cores.yaml: {}
   120_filesys-free-space.yaml: {}
   130_filesys-ngcp.yaml: {}
 [% IF general.ngcp_type != 'spce' -%]