diff --git a/include/tests_boot_services b/include/tests_boot_services
index b9c66f30..9ba00635 100644
--- a/include/tests_boot_services
+++ b/include/tests_boot_services
@@ -613,8 +613,8 @@
                     for J in ${FIND}; do
                         LogText "Test: checking permissions of file ${J}"
                         if IsWorldWritable ${J}; then
-                            LogText "Result: warning, file ${J} is world writable"
                             FOUND=1
+                            LogText "Result: warning, file ${J} is world writable"
                           else
                             LogText "Result: good, file ${J} not world writable"
                         fi
@@ -634,8 +634,8 @@
                 FIND=`find /etc/rc${NO}.d -type f -print`
                 for I in ${FIND}; do
                     if IsWorldWritable ${I}; then
-                        LogText "Result: warning, file ${I} is world writable"
                         FOUND=1
+                        LogText "Result: warning, file ${I} is world writable"
                       else
                         LogText "Result: good, file ${I} not world writable"
                     fi
@@ -649,15 +649,15 @@
             if [ -f ${I} ]; then
                 ShowSymlinkPath "${I}"
                 if [ ${FOUNDPATH} -eq 1 ]; then
-                    CHECKFILE="$SYMLINK"
+                    CHECKFILE="${SYMLINK}"
                     LogText "Result: found the path behind this symlink (${CHECKFILE} --> ${I})"
-                else
-                    CHECKFILE="$I"
+                  else
+                    CHECKFILE="${I}"
                 fi
                 LogText "Test: Checking ${CHECKFILE} file for writable bit"
                 if IsWorldWritable ${CHECKFILE}; then
-                    ReportWarning ${TEST_NO} "H" "Found writable startup script ${CHECKFILE}"
                     FOUND=1
+                    ReportWarning ${TEST_NO} "H" "Found writable startup script ${CHECKFILE}"
                     LogText "Result: warning, file ${CHECKFILE} is world writable"
                   else
                     LogText "Result: good, file ${CHECKFILE} not world writable"