diff --git a/test/pvusb-001-mouse-kbd-attached b/test/pvusb-001-mouse-kbd-attached
index 8e21edcd..dd9b27f9 100755
--- a/test/pvusb-001-mouse-kbd-attached
+++ b/test/pvusb-001-mouse-kbd-attached
@@ -5,10 +5,11 @@ tmpf=`mktemp`
 sudo xenstore-ls -f qubes-usb-devices | sort > $tmpf
 
 cat << 'END' | diff -u - $tmpf
-qubes-usb-devices/045e_0745 = ""
-qubes-usb-devices/045e_0745/desc = "045e_0745 Microsoft_Microsoft\xc2\xae_Nano_Transceiver_v1.0"
-qubes-usb-devices/046a_0021 = ""
-qubes-usb-devices/046a_0021/desc = "046a_0021 046a_0021"
+qubes-usb-devices/002 = ""
+qubes-usb-devices/002/002 = ""
+qubes-usb-devices/002/002/desc = "046a:0021 046a_0021"
+qubes-usb-devices/002/003 = ""
+qubes-usb-devices/002/003/desc = "045e:0745 Microsoft_Microsoft\xc2\xae_Nano_Transceiver_v1.0"
 END
 
 rm $tmpf
diff --git a/test/pvusb-002-mouse-kbd-usbstick-wlan-attached b/test/pvusb-002-mouse-kbd-usbstick-wlan-attached
index 0805ac28..5c2c3b33 100755
--- a/test/pvusb-002-mouse-kbd-usbstick-wlan-attached
+++ b/test/pvusb-002-mouse-kbd-usbstick-wlan-attached
@@ -5,14 +5,16 @@ tmpf=`mktemp`
 sudo xenstore-ls -f qubes-usb-devices | sort > $tmpf
 
 cat << 'END' | diff -u - $tmpf
-qubes-usb-devices/045e_0745 = ""
-qubes-usb-devices/045e_0745/desc = "045e_0745 Microsoft_Microsoft\xc2\xae_Nano_Transceiver_v1.0"
-qubes-usb-devices/046a_0021 = ""
-qubes-usb-devices/046a_0021/desc = "046a_0021 046a_0021"
-qubes-usb-devices/0781_5530 = ""
-qubes-usb-devices/0781_5530/desc = "0781_5530 SanDisk_Cruzer_1942531DB09038A6"
-qubes-usb-devices/07d1_3c0a = ""
-qubes-usb-devices/07d1_3c0a/desc = "07d1_3c0a Ralink_11n_Adapter_1.0"
+qubes-usb-devices/002 = ""
+qubes-usb-devices/002/002 = ""
+qubes-usb-devices/002/002/desc = "046a:0021 046a_0021"
+qubes-usb-devices/002/003 = ""
+qubes-usb-devices/002/003/desc = "045e:0745 Microsoft_Microsoft\xc2\xae_Nano_Transceiver_v1.0"
+qubes-usb-devices/007 = ""
+qubes-usb-devices/007/010 = ""
+qubes-usb-devices/007/010/desc = "0781:5530 SanDisk_Cruzer_1942531DB09038A6"
+qubes-usb-devices/007/013 = ""
+qubes-usb-devices/007/013/desc = "07d1:3c0a Ralink_11n_Adapter_1.0"
 END
 
 rm $tmpf