diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
index b18b3baaf..be2178118 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
+++ b/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
@@ -129,7 +129,7 @@
   </pm>
   <devices>
     <emulator>/new/emu</emulator>
-    <controller type="usb" index="0" model="nec-xhci"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
     <controller type="virtio-scsi" index="0"/>
     <filesystem type="mount" accessmode="mapped">
       <source dir="/foo/source"/>
@@ -317,7 +317,7 @@
   </pm>
   <devices>
     <emulator>/new/emu</emulator>
-    <controller type="usb" index="0" model="nec-xhci"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
     <controller type="virtio-scsi" index="0"/>
     <filesystem type="mount" accessmode="mapped">
       <source dir="/foo/source"/>
diff --git a/virtinst/cli.py b/virtinst/cli.py
index 7598a5cb4..a8c094ae0 100644
--- a/virtinst/cli.py
+++ b/virtinst/cli.py
@@ -2346,9 +2346,7 @@ class ParserController(VirtCLIParser):
         if self.optstr == "usb2":
             return DeviceController.get_usb2_controllers(inst.conn)
         elif self.optstr == "usb3":
-            inst.type = "usb"
-            inst.model = "nec-xhci"
-            return inst
+            return DeviceController.get_usb3_controller(inst.conn, self.guest)
         return VirtCLIParser._parse(self, inst)