diff --git a/include/tests_usb b/include/tests_usb
index d2d5a5ac..35bd7b69 100644
--- a/include/tests_usb
+++ b/include/tests_usb
@@ -23,7 +23,6 @@
 #
 #################################################################################
 #
-
     USBGUARD_FOUND=0
     USBGUARD_CONFIG=""
     USBGUARD_RULES=""
@@ -35,24 +34,20 @@
     USBGUARD_RULES_ALLOW=0
     USBGUARD_RULES_BLOCK=0
     USBGUARD_RULES_REJECT=0
-
 #
 #################################################################################
 #
-
     # Test to determine if USBGuard is installed.  If it is, we will limit
     # suggestions from other tests.
     if [ ! -z "${USBGUARDBINARY}" ]; then
         USBGUARD_FOUND=1
     fi
-
 #
 #################################################################################
 #
-
-    # Test        : USB-0100
+    # Test        : USB-1200
     # Description : Check for disabled USB storage
-    Register --test-no USB-0100 --os Linux --weight L --network NO --category security --description "Check if USB storage is disabled"
+    Register --test-no USB-1200 --os Linux --weight L --network NO --category security --description "Check if USB storage is disabled"
     if [ ${SKIPTEST} -eq 0 ]; then
         FOUND=0
         LogText "Test: Checking USB storage driver in directory /etc/modprobe.d and configuration file /etc/modprobe.conf"
@@ -89,14 +84,12 @@
             AddHP 3 3
         fi
     fi
-
 #
 #################################################################################
 #
-
-    # Test        : USB-0200
+    # Test        : USB-2000
     # Description : Check USB authorizations
-    Register --test-no USB-0200 --os Linux --weight L --network NO --category security --description "Check USB authorizations"
+    Register --test-no USB-2000 --os Linux --weight L --network NO --category security --description "Check USB authorizations"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking USB devices authorization to connect to the system"
         FOUND=0
@@ -134,11 +127,11 @@
 #################################################################################
 #
 
-    # Test        : USB-0300
+    # Test        : USB-3000
     # Description : Perform USBGuard check
-    Register --test-no USB-0300  --os Linux --weight L --network NO --category security --description "Check for presence of USBGuard"
+    Register --test-no USB-3000  --os Linux --weight L --network NO --category security --description "Check for presence of USBGuard"
     if [ ${SKIPTEST} -eq 0 ]; then
-        if [ "${USBGUARD_FOUND}" -gt "0" ]; then
+        if [ ${USBGUARD_FOUND} -eq 1 ]; then
             LogText "Result: USBGuard is installed (${USBGUARDBINARY})"
             Display --indent 2 --text "- Checking USBGuard" --result "${STATUS_FOUND}" --color GREEN
             AddHP 1 1
@@ -343,7 +336,6 @@
         fi
 
     fi
-
 #
 #################################################################################
 #
@@ -352,3 +344,4 @@ WaitForKeyPress
 
 #
 #================================================================================
+# Lynis - Security Auditing and System Hardening for Linux and UNIX - https://cisofy.com