Index: /trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py	(revision 54121)
+++ /trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py	(revision 54122)
@@ -1069,7 +1069,7 @@
         try:
             if fEnable:
-                    cXhciCtls = self.o.machine.getUSBControllerCountByType(vboxcon.USBControllerType_XHCI);
-                    if cXhciCtls == 0:
-                        self.o.machine.addUSBController('XHCI', vboxcon.USBControllerType_XHCI);
+                cXhciCtls = self.o.machine.getUSBControllerCountByType(vboxcon.USBControllerType_XHCI);
+                if cXhciCtls == 0:
+                    self.o.machine.addUSBController('XHCI', vboxcon.USBControllerType_XHCI);
             else:
                 cXhciCtls = self.o.machine.getUSBControllerCountByType(vboxcon.USBControllerType_XHCI);
Index: /trunk/src/VBox/ValidationKit/tests/usb/tdUsb1.py
===================================================================
--- /trunk/src/VBox/ValidationKit/tests/usb/tdUsb1.py	(revision 54121)
+++ /trunk/src/VBox/ValidationKit/tests/usb/tdUsb1.py	(revision 54122)
@@ -251,10 +251,10 @@
             return kdGadgetsConfigured.get(sSpeed);
 
-        return None;
+        return (None, None);
 
     #
     # Test execution helpers.
     #
-    def testUsbCompliance(self, oSession, oTxsSession, sVmName, sSpeed):
+    def testUsbCompliance(self, oSession, oTxsSession, sSpeed):
         """
         Test VirtualBoxs USB stack in a VM.
@@ -332,5 +332,5 @@
                 self.sleep(5);
 
-                fRc = self.testUsbCompliance(oSession, oTxsSession, sVmName, sSpeed);
+                fRc = self.testUsbCompliance(oSession, oTxsSession, sSpeed);
 
                 # cleanup.