diff --git a/templates/135_filesys-logfiles.yaml.tt2 b/templates/135_filesys-logfiles.yaml.tt2
index 6216b0f..bc14f99 100644
--- a/templates/135_filesys-logfiles.yaml.tt2
+++ b/templates/135_filesys-logfiles.yaml.tt2
@@ -42,20 +42,6 @@ file:
     group: adm
     filetype: file
 
-  /var/log/debug:
-    exists: true
-    mode: "0640"
-    owner: root
-    group: adm
-    filetype: file
-
-  /var/log/messages:
-    exists: true
-    mode: "0640"
-    owner: root
-    group: adm
-    filetype: file
-
 
   /var/log/ngcp/api.log:
     exists:
@@ -159,3 +145,51 @@ command:
       - '!/./'
     stderr:
       - '!/./'
+
+# optionally existing files
+
+  # /var/log/debug
+
+  "find /var/log/ -type f -name debug ! -user root":
+    exit-status: 0
+    stdout:
+      - '!/./'
+    stderr:
+      - '!/./'
+
+  "find /var/log/ -type f -name debug ! -group adm":
+    exit-status: 0
+    stdout:
+      - '!/./'
+    stderr:
+      - '!/./'
+
+  "find /var/log/ -type f -name debug ! -perm 640":
+    exit-status: 0
+    stdout:
+      - '!/./'
+    stderr:
+      - '!/./'
+
+  # /var/log/messages
+
+  "find /var/log/ -type f -name messages ! -user root":
+    exit-status: 0
+    stdout:
+      - '!/./'
+    stderr:
+      - '!/./'
+
+  "find /var/log/ -type f -name messages ! -group adm":
+    exit-status: 0
+    stdout:
+      - '!/./'
+    stderr:
+      - '!/./'
+
+  "find /var/log/ -type f -name messages ! -perm 640":
+    exit-status: 0
+    stdout:
+      - '!/./'
+    stderr:
+      - '!/./'