diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-ich9-autoassign.args
rename to tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml b/tests/qemuxml2argvdata/usb-controller-ich9-autoassign.xml
similarity index 100%
rename from tests/qemuxml2argvdata/usb-ich9-autoassign.xml
rename to tests/qemuxml2argvdata/usb-controller-ich9-autoassign.xml
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-controller-ich9-companion.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-ich9-companion.args
rename to tests/qemuxml2argvdata/usb-controller-ich9-companion.args
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.xml b/tests/qemuxml2argvdata/usb-controller-ich9-companion.xml
similarity index 100%
rename from tests/qemuxml2argvdata/usb-ich9-companion.xml
rename to tests/qemuxml2argvdata/usb-controller-ich9-companion.xml
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
rename to tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.xml
similarity index 100%
rename from tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml
rename to tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.xml
diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.err b/tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err
similarity index 100%
rename from tests/qemuxml2argvdata/usb-ich9-no-companion.err
rename to tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err
diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml b/tests/qemuxml2argvdata/usb-controller-ich9-no-companion.xml
similarity index 100%
rename from tests/qemuxml2argvdata/usb-ich9-no-companion.xml
rename to tests/qemuxml2argvdata/usb-controller-ich9-no-companion.xml
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-controller-piix3.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-piix3-controller.args
rename to tests/qemuxml2argvdata/usb-controller-piix3.args
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.xml b/tests/qemuxml2argvdata/usb-controller-piix3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/usb-piix3-controller.xml
rename to tests/qemuxml2argvdata/usb-controller-piix3.xml
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 00cde55b5a..6c10af0ec2 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1500,19 +1500,59 @@ mymain(void)
     DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path",
                         QEMU_CAPS_CHARDEV_RECONNECT);
 
+    DO_TEST_NOCAPS("usb-none");
+
     DO_TEST_NOCAPS("usb-controller");
-    DO_TEST("usb-piix3-controller",
+    DO_TEST("usb-controller-piix3",
             QEMU_CAPS_PIIX3_USB_UHCI);
-    DO_TEST("usb-ich9-ehci-addr",
+    DO_TEST("usb-controller-ich9-ehci-addr",
             QEMU_CAPS_ICH9_USB_EHCI1);
-    DO_TEST_NOCAPS("input-usbmouse-addr");
-    DO_TEST("usb-ich9-companion",
+    DO_TEST("usb-controller-ich9-companion",
             QEMU_CAPS_ICH9_USB_EHCI1);
-    DO_TEST_PARSE_ERROR("usb-ich9-no-companion",
+    DO_TEST_PARSE_ERROR("usb-controller-ich9-no-companion",
             QEMU_CAPS_ICH9_USB_EHCI1);
-    DO_TEST("usb-ich9-autoassign",
+    DO_TEST("usb-controller-ich9-autoassign",
             QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_USB_HUB);
+    DO_TEST("usb1-usb2",
+            QEMU_CAPS_PIIX3_USB_UHCI,
+            QEMU_CAPS_USB_HUB,
+            QEMU_CAPS_ICH9_USB_EHCI1);
+
+    DO_TEST("usb-controller-default-q35",
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_PCI_OHCI,
+            QEMU_CAPS_PIIX3_USB_UHCI,
+            QEMU_CAPS_NEC_USB_XHCI);
+    DO_TEST_FAILURE("usb-controller-default-unavailable-q35",
+                    QEMU_CAPS_DEVICE_IOH3420,
+                    QEMU_CAPS_PCI_OHCI,
+                    QEMU_CAPS_NEC_USB_XHCI);
+    DO_TEST("usb-controller-explicit-q35",
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_PCI_OHCI,
+            QEMU_CAPS_PIIX3_USB_UHCI,
+            QEMU_CAPS_NEC_USB_XHCI);
+    DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35",
+                    QEMU_CAPS_DEVICE_IOH3420,
+                    QEMU_CAPS_PCI_OHCI,
+                    QEMU_CAPS_PIIX3_USB_UHCI);
+    DO_TEST("usb-controller-xhci",
+            QEMU_CAPS_PIIX3_USB_UHCI,
+            QEMU_CAPS_NEC_USB_XHCI);
+    DO_TEST("usb-xhci-autoassign",
+            QEMU_CAPS_PIIX3_USB_UHCI,
+            QEMU_CAPS_NEC_USB_XHCI,
+            QEMU_CAPS_USB_HUB);
+    DO_TEST_PARSE_ERROR("usb-controller-xhci-limit",
+            QEMU_CAPS_PIIX3_USB_UHCI,
+            QEMU_CAPS_NEC_USB_XHCI);
+    DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI);
+    DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable");
+    DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit",
+                        QEMU_CAPS_DEVICE_QEMU_XHCI);
+
+    DO_TEST_NOCAPS("input-usbmouse-addr");
     DO_TEST("usb-hub",
             QEMU_CAPS_USB_HUB);
     DO_TEST("usb-hub-autoadd",
@@ -1558,47 +1598,10 @@ mymain(void)
             QEMU_CAPS_USB_REDIR_FILTER,
             QEMU_CAPS_DEVICE_CIRRUS_VGA);
     DO_TEST_CAPS_LATEST("usb-redir-unix");
-    DO_TEST("usb1-usb2",
-            QEMU_CAPS_PIIX3_USB_UHCI,
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_ICH9_USB_EHCI1);
-    DO_TEST_NOCAPS("usb-none");
     DO_TEST_PARSE_ERROR_NOCAPS("usb-none-other");
     DO_TEST_PARSE_ERROR("usb-none-hub",
             QEMU_CAPS_USB_HUB);
     DO_TEST_PARSE_ERROR_NOCAPS("usb-none-usbtablet");
-    DO_TEST("usb-controller-default-q35",
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_PCI_OHCI,
-            QEMU_CAPS_PIIX3_USB_UHCI,
-            QEMU_CAPS_NEC_USB_XHCI);
-    DO_TEST_FAILURE("usb-controller-default-unavailable-q35",
-                    QEMU_CAPS_DEVICE_IOH3420,
-                    QEMU_CAPS_PCI_OHCI,
-                    QEMU_CAPS_NEC_USB_XHCI);
-    DO_TEST("usb-controller-explicit-q35",
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_PCI_OHCI,
-            QEMU_CAPS_PIIX3_USB_UHCI,
-            QEMU_CAPS_NEC_USB_XHCI);
-    DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35",
-                    QEMU_CAPS_DEVICE_IOH3420,
-                    QEMU_CAPS_PCI_OHCI,
-                    QEMU_CAPS_PIIX3_USB_UHCI);
-    DO_TEST("usb-controller-xhci",
-            QEMU_CAPS_PIIX3_USB_UHCI,
-            QEMU_CAPS_NEC_USB_XHCI);
-    DO_TEST("usb-xhci-autoassign",
-            QEMU_CAPS_PIIX3_USB_UHCI,
-            QEMU_CAPS_NEC_USB_XHCI,
-            QEMU_CAPS_USB_HUB);
-    DO_TEST_PARSE_ERROR("usb-controller-xhci-limit",
-            QEMU_CAPS_PIIX3_USB_UHCI,
-            QEMU_CAPS_NEC_USB_XHCI);
-    DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI);
-    DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable");
-    DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit",
-                        QEMU_CAPS_DEVICE_QEMU_XHCI);
 
     DO_TEST_NOCAPS("smbios");
     DO_TEST_PARSE_ERROR_NOCAPS("smbios-date");
diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 87bd6389a6..a958daf56d 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -483,7 +483,8 @@ mymain(void)
 
     DO_TEST_CAPS_LATEST("usb-none");
     DO_TEST_CAPS_LATEST("usb-controller");
-    DO_TEST_CAPS_LATEST("usb-piix3-controller");
+    DO_TEST_CAPS_LATEST("usb-controller-piix3");
+    DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr");
     DO_TEST_CAPS_LATEST("usb-controller-default-q35");
     DO_TEST_CAPS_LATEST("usb-controller-explicit-q35");
     DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64");
@@ -573,7 +574,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("numad-auto-vcpu-no-numatune");
     DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement");
     DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset");
-    DO_TEST_CAPS_LATEST("usb-ich9-ehci-addr");
     DO_TEST_CAPS_LATEST("disk-copy_on_read");
     DO_TEST_CAPS_LATEST("tpm-passthrough");
     DO_TEST_CAPS_LATEST("tpm-passthrough-crb");