diff --git a/include/tests_usb b/include/tests_usb
index 35bd7b69..dcb8ad77 100644
--- a/include/tests_usb
+++ b/include/tests_usb
@@ -45,9 +45,9 @@
 #
 #################################################################################
 #
-    # Test        : USB-1200
+    # Test        : STRG-1840 (future ID: USB-1200)
     # Description : Check for disabled USB storage
-    Register --test-no USB-1200 --os Linux --weight L --network NO --category security --description "Check if USB storage is disabled"
+    Register --test-no STRG-1840 --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"
@@ -87,9 +87,9 @@
 #
 #################################################################################
 #
-    # Test        : USB-2000
+    # Test        : STRG-1842 (future ID: USB-2000)
     # Description : Check USB authorizations
-    Register --test-no USB-2000 --os Linux --weight L --network NO --category security --description "Check USB authorizations"
+    Register --test-no STRG-1842 --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
@@ -112,7 +112,7 @@
             LogText "Result: Some USB devices are authorized by default (or temporary) to connect to the system"
             Display --indent 2 --text "- Checking USB devices authorization" --result "${STATUS_ENABLED}" --color YELLOW
             # To-Be-Added: create documentation and enable the suggestion
-            #if [ "${USBGUARD_FOUND}" -eq "0" ]; then
+            #if [ ${USBGUARD_FOUND} -eq 0 ]; then
             #   ReportSuggestion ${TEST_NO} "Disable USB devices authorization, to prevent unauthorized storage or data theft"
             #fi
             AddHP 0 3