diff --git a/include/tests_mail_messaging b/include/tests_mail_messaging
index aae8b1f2..2c9a2d66 100644
--- a/include/tests_mail_messaging
+++ b/include/tests_mail_messaging
@@ -101,7 +101,10 @@
         FIND1=$(${POSTCONFBINARY} 2> /dev/null | ${GREPBINARY} '^smtpd_banner' | ${GREPBINARY} 'postfix')
         FIND2=$(${POSTCONFBINARY} 2> /dev/null | ${GREPBINARY} '^smtpd_banner' | ${GREPBINARY} '$mail_name')
         FIND3=$(${POSTCONFBINARY} 2> /dev/null | ${GREPBINARY} '^mail_name' | ${GREPBINARY} -i 'postfix')
-        FIND4=$(${POSTCONFBINARY} 2> /dev/null | ${GREPBINARY} '^smtpd_banner' | ${EGREPBINARY} -i "${OS}|${LINUX_VERSION}")
+        FIND4=$(${POSTCONFBINARY} 2> /dev/null | ${GREPBINARY} '^smtpd_banner' | ${GREPBINARY} -i "${OS}")
+        if [ ! -z "${LINUX_VERSION}" ]; then
+            FIND5=$(${POSTCONFBINARY} 2> /dev/null | ${GREPBINARY} '^smtpd_banner' | ${GREPBINARY} -i "${LINUX_VERSION}")
+        fi
         SHOWWARNING=0
 
         if [ ! -z "${FIND1}" ]; then
@@ -113,6 +116,9 @@
         elif [ ! -z "${FIND4}" ]; then
             SHOWWARNING=1
             Report "banner_os_disclosure[]=${FIND4}"
+        elif [ ! -z "${FIND5}" ]; then
+            SHOWWARNING=1
+            Report "banner_os_disclosure[]=${FIND5}"
         fi
 
         if [ ${SHOWWARNING} -eq 1 ]; then