diff --git a/include/tests_boot_services b/include/tests_boot_services
index e6d42f93..7b039978 100644
--- a/include/tests_boot_services
+++ b/include/tests_boot_services
@@ -62,7 +62,7 @@
     Register --test-no BOOT-5104 --weight L --network NO --description "Determine service manager"
     if [ ${SKIPTEST} -eq 0 ]; then
         case ${OS} in
-            Linux)
+            "Linux")
                 if [ -f /proc/1/cmdline ]; then
                     FILE=`cat /proc/1/cmdline`
                     if [ -L ${FILE} ]; then
@@ -95,7 +95,7 @@
                     if [ -f /usr/bin/init-openrc ]; then SERVICE_MANAGER="openrc"; fi
                 fi
             ;;
-            NetBSD)
+            "DragonFly"|"NetBSD")
                 if [ -x /sbin/init -a -d /etc/rc.d -a -f /etc/rc ]; then
                     SERVICE_MANAGER="bsdrc"
                 fi
@@ -634,9 +634,9 @@
                 fi
                 ;;
 
-             MacOS)
+             DragonFly|MacOS)
                 if [ ! "${SYSCTLBINARY}" = "" ]; then
-                    FIND=`${SYSCTLBINARY} kern.boottime | awk '{ print $5 }' | sed -e 's/,//'`
+                    FIND=`${SYSCTLBINARY} kern.boottime | awk '{ print $5 }' | sed -e 's/,//' | grep "[0-9]"`
                   else
                     Display --indent 2 --text "- Checking uptime" --result SKIPPED --color YELLOW
                     ReportException "${TEST_NO}:4" "No uptime test available for this operating system (sysctl missing)"