diff --git a/include/tests_filesystems b/include/tests_filesystems
index 5b9710eb..397cdc46 100644
--- a/include/tests_filesystems
+++ b/include/tests_filesystems
@@ -223,15 +223,17 @@
     if [ ${SKIPTEST} -eq 0 ]; then
         # Swap partitions should be mounted with 'sw' or 'swap'
         logtext "Test: check swap partitions with incorrect mount options"
-        FIND=`awk '{ if ($3=="swap" && ($4!="sw" && $4!="swap" && $4!="defaults")) print $1 }' /etc/fstab`
-        if [ "${FIND}" = "" ]; then
+        #FIND=`awk '{ if ($3=="swap" && ($4!="sw" && $4!="swap" && $4!="defaults")) print $1 }' /etc/fstab`
+        FIND=`awk '{ if ($3=="swap" && $4~/sw/) { print $1 }}' /etc/fstab`
+        if [ ! "${FIND}" = "" ]; then
             Display --indent 2 --text "- Testing swap partitions" --result OK --color GREEN
             logtext "Result: all swap partitions have correct options (sw or swap)"
           else
             Display --indent 2 --text "- Testing swap partitions" --result WARNING --color RED
             logtext "Result: possible incorrect mount options used for mounting swap partition (${FIND})"
             #ReportWarning ${TEST_NO} "L" "Possible incorrect mount options used for swap parition (${FIND})"
-            ReportSuggestion ${TEST_NO} "Check your /etc/fstab file. Swap partition usually have 'sw' or 'swap' in the options field (4th)."
+            ReportSuggestion ${TEST_NO} "Check your /etc/fstab file for swap partition mount options"
+            logtext "Notes: usually swap partition have 'sw' or 'swap' in the options field (4th)"
         fi
     fi
 #