diff --git a/qemu/tests/cfg/usb.cfg b/qemu/tests/cfg/usb.cfg
index 80ce897046249923a1251580878054372efc2e5f..7b02db4e93e607843f2e4ff1a4638f1a93903050 100644
--- a/qemu/tests/cfg/usb.cfg
+++ b/qemu/tests/cfg/usb.cfg
@@ -11,17 +11,17 @@
     variants:
         - uhci:
             usb_type_usbtest = piix3-usb-uhci
-            usb_controller_testdev = uhci
+            usb_controller = uhci
             usb_max_port_usbtest = 2
             drive_format_stg = "usb1"
         - ehci:
             usb_type_usbtest = ich9-usb-ehci1
-            usb_controller_testdev = ehci
+            usb_controller = ehci
             usb_max_port_usbtest = 6
             drive_format_stg = "usb2"
         - xhci:
             usb_type_usbtest = nec-usb-xhci
-            usb_controller_testdev = xhci
+            usb_controller = xhci
             usb_max_port_usbtest = 4
             drive_format_stg = "usb3"
 
@@ -34,6 +34,18 @@
             usb_type_hub1 = usb-hub
             usb_port_hub1 = "2"
             usb_port_testdev = "2.1"
+            variants:
+                - one_usb_dev:
+                - max_usb_dev:
+                    only usb_boot, usb_reboot
+                    usb_devices += " d1 d2 d3 d4 d5 d6 d7"
+                    usb_port_d1 = "2.2"
+                    usb_port_d2 = "2.3"
+                    usb_port_d3 = "2.4"
+                    usb_port_d4 = "2.5"
+                    usb_port_d5 = "2.6"
+                    usb_port_d6 = "2.7"
+                    usb_port_d7 = "2.8"
     # usb devices
     variants:
         - @usb_nodev:
@@ -42,7 +54,7 @@
             only usb_storage, usb_host, usb_multi_disk
         - usb_kbd:
             only usb_boot, usb_reboot, usb_hotplug
-            usb_type_testdev = "usb-kbd"
+            usb_type = "usb-kbd"
             info_usb_name = "QEMU USB Keyboard"
             vendor_id = "0627"
             product_id = "0001"
@@ -50,7 +62,7 @@
             product = "QEMU USB Keyboard"
         - usb_mouse:
             only usb_boot, usb_reboot, usb_hotplug
-            usb_type_testdev = "usb-mouse"
+            usb_type = "usb-mouse"
             info_usb_name = "QEMU USB Mouse"
             vendor_id = "0627"
             product_id = "0001"
@@ -58,7 +70,7 @@
             product = "QEMU USB Mouse"
         - usb_tablet:
             only usb_boot, usb_reboot, usb_hotplug
-            usb_type_testdev = "usb-tablet"
+            usb_type = "usb-tablet"
             info_usb_name = "QEMU USB Tablet"
             vendor_id = "0627"
             product_id = "0001"
@@ -66,7 +78,7 @@
             product = "QEMU USB Tablet"
         - usb_ccid:
             only usb_boot, usb_reboot, usb_hotplug
-            usb_type_testdev = "usb-ccid"
+            usb_type = "usb-ccid"
             info_usb_name = "QEMU USB CCID"
             vendor_id = "08E6"
             product_id = "4433"
@@ -75,7 +87,7 @@
         - usb_audio:
             no Host_RHEL.6
             only usb_boot, usb_reboot, usb_hotplug
-            usb_type_testdev = usb-audio
+            usb_type = usb-audio
             info_usb_name = "QEMU USB Audio"
             vendor_id = "46F4"
             product_id = "0002"
@@ -83,7 +95,7 @@
             product = "QEMU USB Audio"
         - usb_hub:
             only usb_boot, usb_reboot, usb_hotplug
-            usb_type_testdev = usb-hub
+            usb_type = usb-hub
             info_usb_name = "QEMU USB Hub"
             vendor_id = "(0000|0409)"
             product_id = "(0000|55aa)"