diff --git a/tests/qemuhelpdata/qemu-0.12.1 b/tests/qemuhelpdata/qemu-0.12.1
index 748625b31a..0caa3b36a2 100644
--- a/tests/qemuhelpdata/qemu-0.12.1
+++ b/tests/qemuhelpdata/qemu-0.12.1
@@ -65,7 +65,7 @@ Display options:
 -full-screen    start in full screen
 -vnc display    start a VNC server on display
 
-1 target only:
+i386 target only:
 -win2k-hack     use it when installing Windows 2000 to avoid a disk full bug
 -no-fd-bootchk  disable boot signature checking for floppy disks
 -no-acpi        disable ACPI
@@ -161,11 +161,6 @@ Debug/Expert options:
 -L path         set the directory for the BIOS, VGA BIOS and keymaps
 -bios file      set the filename for the BIOS
 -enable-kvm     enable KVM full virtualization support
--xen-domid id   specify xen guest domain id
--xen-create     create domain using xen hypercalls, bypassing xend
-                warning: should not be used when xend is in use
--xen-attach     attach to existing xen domain
-                xend will use this when starting qemu
 -no-reboot      exit instead of rebooting
 -no-shutdown    stop before shutdown
 -loadvm [tag|id]
diff --git a/tests/qemuhelpdata/qemu-0.12.1-device b/tests/qemuhelpdata/qemu-0.12.1-device
index e69de29bb2..63c7bef4d6 100644
--- a/tests/qemuhelpdata/qemu-0.12.1-device
+++ b/tests/qemuhelpdata/qemu-0.12.1-device
@@ -0,0 +1,62 @@
+name "pci-bridge", bus PCI
+name "virtio-balloon-pci", bus PCI
+name "virtio-console-pci", bus PCI
+name "virtio-net-pci", bus PCI
+name "virtio-blk-pci", bus PCI
+name "i82562", bus PCI
+name "i82559er", bus PCI
+name "i82559c", bus PCI
+name "i82559b", bus PCI
+name "i82559a", bus PCI
+name "i82558b", bus PCI
+name "i82558a", bus PCI
+name "i82557c", bus PCI
+name "i82557b", bus PCI
+name "i82557a", bus PCI
+name "i82551", bus PCI
+name "i82550", bus PCI
+name "pcnet", bus PCI
+name "rtl8139", bus PCI
+name "e1000", bus PCI, desc "Intel Gigabit Ethernet"
+name "ide-drive", bus IDE
+name "isa-ide", bus ISA
+name "piix4-ide", bus PCI, no-user
+name "piix3-ide", bus PCI, no-user
+name "i8042", bus ISA, no-user
+name "sb16", bus ISA, desc "Creative Sound Blaster 16"
+name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370"
+name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio"
+name "VGA", bus PCI
+name "SUNW,fdtwo", bus System
+name "sysbus-fdc", bus System
+name "isa-fdc", bus ISA, no-user
+name "mc146818rtc", bus ISA, no-user
+name "isa-serial", bus ISA
+name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA"
+name "isa-parallel", bus ISA
+name "PIIX3", bus PCI, desc "ISA bridge", no-user
+name "i440FX", bus PCI, desc "Host bridge", no-user
+name "i440FX-pcihost", bus System, no-user
+name "piix4-usb-uhci", bus PCI
+name "piix3-usb-uhci", bus PCI
+name "vmware-svga", bus PCI
+name "ib700", bus ISA
+name "ne2k_isa", bus ISA
+name "smbus-eeprom", bus I2C
+name "scsi-disk", bus SCSI, desc "virtual scsi disk or cdrom"
+name "scsi-generic", bus SCSI, desc "pass through generic scsi device (/dev/sg*)"
+name "usb-hub", bus USB
+name "usb-host", bus USB
+name "usb-kbd", bus USB
+name "usb-mouse", bus USB
+name "usb-tablet", bus USB
+name "usb-storage", bus USB
+name "usb-wacom-tablet", bus USB, desc "QEMU PenPartner Tablet"
+name "usb-braille", bus USB
+name "usb-serial", bus USB
+name "usb-net", bus USB
+name "usb-bt-dongle", bus USB
+name "i6300esb", bus PCI
+name "ne2k_pci", bus PCI
+name "lsi53c895a", bus PCI, alias "lsi"
+name "isabus-bridge", bus System, no-user
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 3d0dd8dc3d..4def27b912 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -163,9 +163,25 @@ mymain(void)
             QEMU_CAPS_SMBIOS_TYPE,
             QEMU_CAPS_VGA_NONE,
             QEMU_CAPS_DRIVE_AIO,
+            QEMU_CAPS_PIIX3_USB_UHCI,
+            QEMU_CAPS_PIIX4_USB_UHCI,
+            QEMU_CAPS_USB_HUB,
             QEMU_CAPS_NO_SHUTDOWN,
             QEMU_CAPS_NO_ACPI,
-            QEMU_CAPS_VNC);
+            QEMU_CAPS_SCSI_LSI,
+            QEMU_CAPS_VNC,
+            QEMU_CAPS_DEVICE_VGA,
+            QEMU_CAPS_DEVICE_CIRRUS_VGA,
+            QEMU_CAPS_DEVICE_VMWARE_SVGA,
+            QEMU_CAPS_DEVICE_USB_SERIAL,
+            QEMU_CAPS_DEVICE_USB_NET,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_DEVICE_SCSI_GENERIC,
+            QEMU_CAPS_DEVICE_USB_STORAGE,
+            QEMU_CAPS_DEVICE_USB_KBD,
+            QEMU_CAPS_DEVICE_RTL8139,
+            QEMU_CAPS_DEVICE_E1000,
+            QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
             QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_KVM,