From 838d7f015c9aac3ccd3acac024ab01accc7fce40 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 9 Dec 2014 11:33:43 -0500
Subject: [PATCH] tests: Drop a bunch of redundant xmlconfig tests

These are mostly covered by clitests. Keep the important ones around
for code coverage.
---
 .../virt-install-disk-kvm-defaults.xml        |  143 +++
 tests/clitest.py                              |    9 +-
 tests/utils.py                                |  158 +--
 tests/xmlconfig-xml/boot-cpuset.xml           |   37 -
 .../boot-fullyvirt-disk-block.xml             |   34 -
 .../boot-fullyvirt-disk-file.xml              |   34 -
 .../boot-fullyvirt-pxe-always.xml             |   31 -
 .../boot-fullyvirt-pxe-nodisks.xml            |   26 -
 tests/xmlconfig-xml/boot-fullyvirt-pxe.xml    |   30 -
 tests/xmlconfig-xml/boot-many-chars.xml       |   47 -
 tests/xmlconfig-xml/boot-many-devices.xml     |  112 --
 tests/xmlconfig-xml/boot-many-disks2.xml      |   72 --
 tests/xmlconfig-xml/boot-many-hostdevs.xml    |   37 -
 tests/xmlconfig-xml/boot-many-nics.xml        |   47 -
 tests/xmlconfig-xml/boot-many-sounds.xml      |   30 -
 .../boot-paravirt-disk-block.xml              |   19 -
 .../boot-paravirt-disk-drv-file.xml           |   20 -
 .../boot-paravirt-disk-drv-phy.xml            |   20 -
 .../boot-paravirt-disk-drv-tap-qcow.xml       |   20 -
 .../boot-paravirt-disk-drv-tap.xml            |   20 -
 .../xmlconfig-xml/boot-paravirt-disk-file.xml |   19 -
 .../boot-paravirt-many-disks.xml              |   28 -
 tests/xmlconfig-xml/boot-usb2.xml             |   36 -
 tests/xmlconfig-xml/boot-windowsxp-kvm.xml    |   44 -
 tests/xmlconfig-xml/install-f10.xml           |   45 -
 tests/xmlconfig-xml/install-f11-ac97.xml      |   54 -
 tests/xmlconfig-xml/install-f11-noac97.xml    |   50 -
 tests/xmlconfig-xml/install-f11-qemu.xml      |   53 -
 tests/xmlconfig-xml/install-f11-xen.xml       |   46 -
 tests/xmlconfig-xml/install-f11.xml           |   53 -
 .../install-fullyvirt-disk-block.xml          |   36 -
 .../install-fullyvirt-disk-file.xml           |   36 -
 .../install-fullyvirt-import-kernel.xml       |   32 -
 .../install-fullyvirt-import-multiboot.xml    |   34 -
 .../install-fullyvirt-import.xml              |   30 -
 .../install-fullyvirt-livecd.xml              |   31 -
 .../install-fullyvirt-pxe-nodisks.xml         |   26 -
 tests/xmlconfig-xml/install-fullyvirt-pxe.xml |   31 -
 .../install-kvm-keymap-local.xml              |   38 -
 .../xmlconfig-xml/install-kvm-keymap-none.xml |   38 -
 .../install-paravirt-disk-block.xml           |   23 -
 .../install-paravirt-disk-drv-file.xml        |   24 -
 .../install-paravirt-disk-drv-phy.xml         |   24 -
 .../install-paravirt-disk-drv-tap-qcow.xml    |   24 -
 .../install-paravirt-disk-drv-tap.xml         |   24 -
 .../install-paravirt-disk-file.xml            |   23 -
 .../xmlconfig-xml/install-paravirt-import.xml |   19 -
 .../install-paravirt-many-disks.xml           |   32 -
 tests/xmlconfig-xml/install-windowsxp-kvm.xml |   49 -
 .../install-windowsxp-xennew.xml              |   45 -
 .../install-windowsxp-xenold.xml              |   41 -
 tests/xmlconfig-xml/misc-qemu-driver-name.xml |   42 -
 .../misc-qemu-driver-overwrite.xml            |   42 -
 tests/xmlconfig-xml/misc-qemu-driver-type.xml |   47 -
 tests/xmlconfig-xml/misc-qemu-iso-disk.xml    |   42 -
 tests/xmlconfig-xml/misc-xml-escaping.xml     |   39 -
 tests/xmlconfig-xml/rhel6-kvm-stage1.xml      |   52 -
 tests/xmlconfig-xml/rhel6-kvm-stage2.xml      |   50 -
 tests/xmlconfig-xml/winxp-kvm-stage1.xml      |   60 -
 tests/xmlconfig-xml/winxp-kvm-stage2.xml      |   59 -
 tests/xmlconfig-xml/winxp-kvm-stage3.xml      |   59 -
 tests/xmlconfig.py                            | 1126 +++--------------
 virtinst/distroinstaller.py                   |    7 -
 63 files changed, 338 insertions(+), 3321 deletions(-)
 create mode 100644 tests/cli-test-xml/compare/virt-install-disk-kvm-defaults.xml
 delete mode 100644 tests/xmlconfig-xml/boot-cpuset.xml
 delete mode 100644 tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml
 delete mode 100644 tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml
 delete mode 100644 tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml
 delete mode 100644 tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml
 delete mode 100644 tests/xmlconfig-xml/boot-fullyvirt-pxe.xml
 delete mode 100644 tests/xmlconfig-xml/boot-many-chars.xml
 delete mode 100644 tests/xmlconfig-xml/boot-many-devices.xml
 delete mode 100644 tests/xmlconfig-xml/boot-many-disks2.xml
 delete mode 100644 tests/xmlconfig-xml/boot-many-hostdevs.xml
 delete mode 100644 tests/xmlconfig-xml/boot-many-nics.xml
 delete mode 100644 tests/xmlconfig-xml/boot-many-sounds.xml
 delete mode 100644 tests/xmlconfig-xml/boot-paravirt-disk-block.xml
 delete mode 100644 tests/xmlconfig-xml/boot-paravirt-disk-drv-file.xml
 delete mode 100644 tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml
 delete mode 100644 tests/xmlconfig-xml/boot-paravirt-disk-drv-tap-qcow.xml
 delete mode 100644 tests/xmlconfig-xml/boot-paravirt-disk-drv-tap.xml
 delete mode 100644 tests/xmlconfig-xml/boot-paravirt-disk-file.xml
 delete mode 100644 tests/xmlconfig-xml/boot-paravirt-many-disks.xml
 delete mode 100644 tests/xmlconfig-xml/boot-usb2.xml
 delete mode 100644 tests/xmlconfig-xml/boot-windowsxp-kvm.xml
 delete mode 100644 tests/xmlconfig-xml/install-f10.xml
 delete mode 100644 tests/xmlconfig-xml/install-f11-ac97.xml
 delete mode 100644 tests/xmlconfig-xml/install-f11-noac97.xml
 delete mode 100644 tests/xmlconfig-xml/install-f11-qemu.xml
 delete mode 100644 tests/xmlconfig-xml/install-f11-xen.xml
 delete mode 100644 tests/xmlconfig-xml/install-f11.xml
 delete mode 100644 tests/xmlconfig-xml/install-fullyvirt-disk-block.xml
 delete mode 100644 tests/xmlconfig-xml/install-fullyvirt-disk-file.xml
 delete mode 100644 tests/xmlconfig-xml/install-fullyvirt-import-kernel.xml
 delete mode 100644 tests/xmlconfig-xml/install-fullyvirt-import-multiboot.xml
 delete mode 100644 tests/xmlconfig-xml/install-fullyvirt-import.xml
 delete mode 100644 tests/xmlconfig-xml/install-fullyvirt-livecd.xml
 delete mode 100644 tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml
 delete mode 100644 tests/xmlconfig-xml/install-fullyvirt-pxe.xml
 delete mode 100644 tests/xmlconfig-xml/install-kvm-keymap-local.xml
 delete mode 100644 tests/xmlconfig-xml/install-kvm-keymap-none.xml
 delete mode 100644 tests/xmlconfig-xml/install-paravirt-disk-block.xml
 delete mode 100644 tests/xmlconfig-xml/install-paravirt-disk-drv-file.xml
 delete mode 100644 tests/xmlconfig-xml/install-paravirt-disk-drv-phy.xml
 delete mode 100644 tests/xmlconfig-xml/install-paravirt-disk-drv-tap-qcow.xml
 delete mode 100644 tests/xmlconfig-xml/install-paravirt-disk-drv-tap.xml
 delete mode 100644 tests/xmlconfig-xml/install-paravirt-disk-file.xml
 delete mode 100644 tests/xmlconfig-xml/install-paravirt-import.xml
 delete mode 100644 tests/xmlconfig-xml/install-paravirt-many-disks.xml
 delete mode 100644 tests/xmlconfig-xml/install-windowsxp-kvm.xml
 delete mode 100644 tests/xmlconfig-xml/install-windowsxp-xennew.xml
 delete mode 100644 tests/xmlconfig-xml/install-windowsxp-xenold.xml
 delete mode 100644 tests/xmlconfig-xml/misc-qemu-driver-name.xml
 delete mode 100644 tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
 delete mode 100644 tests/xmlconfig-xml/misc-qemu-driver-type.xml
 delete mode 100644 tests/xmlconfig-xml/misc-qemu-iso-disk.xml
 delete mode 100644 tests/xmlconfig-xml/misc-xml-escaping.xml
 delete mode 100644 tests/xmlconfig-xml/rhel6-kvm-stage1.xml
 delete mode 100644 tests/xmlconfig-xml/rhel6-kvm-stage2.xml
 delete mode 100644 tests/xmlconfig-xml/winxp-kvm-stage1.xml
 delete mode 100644 tests/xmlconfig-xml/winxp-kvm-stage2.xml
 delete mode 100644 tests/xmlconfig-xml/winxp-kvm-stage3.xml

diff --git a/tests/cli-test-xml/compare/virt-install-disk-kvm-defaults.xml b/tests/cli-test-xml/compare/virt-install-disk-kvm-defaults.xml
new file mode 100644
index 000000000..e100cfa28
--- /dev/null
+++ b/tests/cli-test-xml/compare/virt-install-disk-kvm-defaults.xml
@@ -0,0 +1,143 @@
+<domain type="kvm">
+  <name>foobar</name>
+  <uuid>00000000-1111-2222-3333-444444444444</uuid>
+  <memory>65536</memory>
+  <currentMemory>65536</currentMemory>
+  <vcpu>1</vcpu>
+  <os>
+    <type arch="x86_64">hvm</type>
+    <boot dev="network"/>
+    <boot dev="hd"/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode="custom" match="exact">
+    <model>core2duo</model>
+  </cpu>
+  <clock offset="utc">
+    <timer name="rtc" tickpolicy="catchup"/>
+    <timer name="pit" tickpolicy="delay"/>
+    <timer name="hpet" present="no"/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-kvm</emulator>
+    <disk type="file" device="disk">
+      <driver name="qemu" type="qcow2"/>
+      <source file="/dev/default-pool/new1.img"/>
+      <target dev="vda" bus="virtio"/>
+    </disk>
+    <disk type="block" device="disk">
+      <driver name="qemu" type="raw" cache="none" io="native"/>
+      <source dev="/iscsi-pool/diskvol1"/>
+      <target dev="vdb" bus="virtio"/>
+    </disk>
+    <disk type="file" device="disk">
+      <driver name="qemu" type="raw"/>
+      <source file="/dev/default-pool/iso-vol"/>
+      <target dev="vdc" bus="virtio"/>
+    </disk>
+    <disk type="file" device="disk">
+      <driver name="qemu" type="raw"/>
+      <source file="/dev/default-pool/iso-vol"/>
+      <target dev="vdd" bus="virtio"/>
+    </disk>
+    <controller type="usb" index="0" model="ich9-ehci1"/>
+    <controller type="usb" index="0" model="ich9-uhci1">
+      <master startport="0"/>
+    </controller>
+    <controller type="usb" index="0" model="ich9-uhci2">
+      <master startport="2"/>
+    </controller>
+    <controller type="usb" index="0" model="ich9-uhci3">
+      <master startport="4"/>
+    </controller>
+    <interface type="bridge">
+      <source bridge="eth0"/>
+      <mac address="00:11:22:33:44:55"/>
+      <model type="virtio"/>
+    </interface>
+    <input type="tablet" bus="usb"/>
+    <console type="pty"/>
+    <channel type="unix">
+      <source mode="bind"/>
+      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    </channel>
+  </devices>
+</domain>
+<domain type="kvm">
+  <name>foobar</name>
+  <uuid>00000000-1111-2222-3333-444444444444</uuid>
+  <memory>65536</memory>
+  <currentMemory>65536</currentMemory>
+  <vcpu>1</vcpu>
+  <os>
+    <type arch="x86_64">hvm</type>
+    <boot dev="hd"/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode="custom" match="exact">
+    <model>core2duo</model>
+  </cpu>
+  <clock offset="utc">
+    <timer name="rtc" tickpolicy="catchup"/>
+    <timer name="pit" tickpolicy="delay"/>
+    <timer name="hpet" present="no"/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-kvm</emulator>
+    <disk type="file" device="disk">
+      <driver name="qemu" type="qcow2"/>
+      <source file="/dev/default-pool/new1.img"/>
+      <target dev="vda" bus="virtio"/>
+    </disk>
+    <disk type="block" device="disk">
+      <driver name="qemu" type="raw" cache="none" io="native"/>
+      <source dev="/iscsi-pool/diskvol1"/>
+      <target dev="vdb" bus="virtio"/>
+    </disk>
+    <disk type="file" device="disk">
+      <driver name="qemu" type="raw"/>
+      <source file="/dev/default-pool/iso-vol"/>
+      <target dev="vdc" bus="virtio"/>
+    </disk>
+    <disk type="file" device="disk">
+      <driver name="qemu" type="raw"/>
+      <source file="/dev/default-pool/iso-vol"/>
+      <target dev="vdd" bus="virtio"/>
+    </disk>
+    <controller type="usb" index="0" model="ich9-ehci1"/>
+    <controller type="usb" index="0" model="ich9-uhci1">
+      <master startport="0"/>
+    </controller>
+    <controller type="usb" index="0" model="ich9-uhci2">
+      <master startport="2"/>
+    </controller>
+    <controller type="usb" index="0" model="ich9-uhci3">
+      <master startport="4"/>
+    </controller>
+    <interface type="bridge">
+      <source bridge="eth0"/>
+      <mac address="00:11:22:33:44:55"/>
+      <model type="virtio"/>
+    </interface>
+    <input type="tablet" bus="usb"/>
+    <console type="pty"/>
+    <channel type="unix">
+      <source mode="bind"/>
+      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    </channel>
+  </devices>
+</domain>
diff --git a/tests/clitest.py b/tests/clitest.py
index 3bf56f942..75b201033 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -581,6 +581,13 @@ c.add_compare("""--hvm --pxe \
 --clock offset=localtime,hpet_present=no,rtc_tickpolicy=merge \
 --pm suspend_to_mem=yes,suspend_to_disk=no \
 """, "many-devices")  # Lots of devices
+c.add_compare("""--hvm --pxe --noautoconsole --nographics \
+--connect %(KVMURI)s --os-variant fedora20 \
+--disk %(NEWIMG1)s,size=1 \
+--disk /iscsi-pool/diskvol1 \
+--disk /dev/default-pool/iso-vol \
+--disk /dev/default-pool/iso-vol,format=qcow2 \
+""", "disk-kvm-defaults")
 c.add_valid("--hvm --disk path=%(EXISTIMG1)s,device=cdrom")  # Specifying cdrom media via --disk
 c.add_valid("--hvm --import --disk path=%(EXISTIMG1)s")  # FV Import install
 c.add_valid("--hvm --import --disk path=%(EXISTIMG1)s --prompt --force")  # Working scenario w/ prompt shouldn't ask anything
@@ -767,7 +774,7 @@ c.add_valid("--paravirt --location %(TREEDIR)s")  # Paravirt location
 c.add_valid("--paravirt --location %(TREEDIR)s --os-variant none")  # Paravirt location with --os-variant none
 c.add_valid("--hvm --location %(TREEDIR)s --os-variant fedora12")  # URL install with manual os-variant
 c.add_valid("--hvm --pxe --boot menu=on")  # Boot menu
-c.add_valid("--hvm --pxe --boot kernel=/tmp/foo1.img,initrd=/tmp/foo2.img,dtb=/tmp/foo2.dtb,extra_args='ro quiet console=/dev/ttyS0,456'")  # Kernel params
+c.add_valid("--hvm --boot kernel=/tmp/foo1.img,initrd=/tmp/foo2.img,dtb=/tmp/foo2.dtb,extra_args='ro quiet console=/dev/ttyS0,456'")  # Kernel params
 c.add_valid("--hvm --pxe --boot cdrom,fd,hd,network,menu=off")  # Boot order
 c.add_valid("--hvm --boot network,hd,menu=on")  # Boot w/o other install option
 c.add_invalid("--hvm --pxe --virt-type bogus")  # Bogus virt-type
diff --git a/tests/utils.py b/tests/utils.py
index 8516994f6..cdc6060de 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -23,10 +23,6 @@ import libvirt
 
 import virtinst
 import virtinst.cli
-from virtinst import VirtualAudio
-from virtinst import VirtualDisk
-from virtinst import VirtualGraphics
-from virtinst import VirtualVideoDevice
 
 # DON'T EDIT THIS. Use 'setup.py test --regenerate-output'
 REGENERATE_OUTPUT = False
@@ -128,36 +124,13 @@ def open_plainkvm(connver=None, libver=None):
     return openconn(_make_uri(uriqemu, connver, libver))
 
 
-def open_plainxen(connver=None, libver=None):
-    return openconn(_make_uri(urixen, connver, libver))
-
-
 def open_test_remote():
     return openconn(uriremote)
 
-_default_conn = open_testdriver()
-_conn = None
 
-
-def set_conn(newconn):
-    global _conn
-    _conn = newconn
-
-
-def reset_conn():
-    set_conn(_default_conn)
-
-
-def get_conn():
-    return _conn
-reset_conn()
-
-# Register libvirt handler
-
-
-def libvirt_callback(ignore, err):
+def _libvirt_callback(ignore, err):
     logging.warn("libvirt errmsg: %s", err[2])
-libvirt.registerErrorHandler(f=libvirt_callback, ctx=None)
+libvirt.registerErrorHandler(f=_libvirt_callback, ctx=None)
 
 
 def sanitize_xml_for_define(xml):
@@ -222,130 +195,3 @@ def diff_compare(actual_out, filename=None, expect_out=None):
                                         tofile="Generated Output"))
     if diff:
         raise AssertionError("Conversion outputs did not match.\n%s" % diff)
-
-
-def get_basic_paravirt_guest(installer=None):
-    g = virtinst.Guest(_conn)
-    g.type = "xen"
-    g.name = "TestGuest"
-    g.memory = int(200 * 1024)
-    g.maxmemory = int(400 * 1024)
-    g.uuid = "12345678-1234-1234-1234-123456789012"
-    gdev = VirtualGraphics(_conn)
-    gdev.type = "vnc"
-    gdev.keymap = "ja"
-    g.add_device(gdev)
-    g.vcpus = 5
-
-    if installer:
-        g.installer = installer
-    else:
-        g.installer._install_kernel = "/boot/vmlinuz"
-        g.installer._install_initrd = "/boot/initrd"
-
-    g.add_default_input_device()
-    g.add_default_console_device()
-
-    return g
-
-
-def get_basic_fullyvirt_guest(typ="xen", installer=None):
-    g = virtinst.Guest(_conn)
-    g.type = typ
-    g.name = "TestGuest"
-    g.memory = int(200 * 1024)
-    g.maxmemory = int(400 * 1024)
-    g.uuid = "12345678-1234-1234-1234-123456789012"
-    g.installer.location = "/dev/null"
-    g.installer.cdrom = True
-    gdev = VirtualGraphics(_conn)
-    gdev.type = "vnc"
-    gdev.keymap = "ja"
-    g.add_device(gdev)
-    g.features.pae = False
-    g.vcpus = 5
-    if installer:
-        g.installer = installer
-    g.emulator = "/usr/lib/xen/bin/qemu-dm"
-    g.os.arch = "i686"
-    g.os.os_type = "hvm"
-
-    g.add_default_input_device()
-    g.add_default_console_device()
-
-    return g
-
-
-def make_import_installer():
-    return virtinst.ImportInstaller(_conn)
-
-
-def make_distro_installer(location="/dev/default-pool/default-vol"):
-    inst = virtinst.DistroInstaller(_conn)
-    inst.location = location
-    return inst
-
-
-def make_live_installer(location="/dev/null"):
-    inst = virtinst.DistroInstaller(_conn)
-    inst.location = location
-    inst.livecd = True
-    inst.cdrom = True
-    return inst
-
-
-def make_pxe_installer():
-    return virtinst.PXEInstaller(_conn)
-
-
-def build_win_kvm(path=None):
-    g = get_basic_fullyvirt_guest("kvm")
-    g.os_variant = "winxp"
-    g.add_device(get_filedisk(path))
-    g.add_device(get_blkdisk())
-    g.add_device(get_virtual_network())
-    g.add_device(VirtualAudio(g.conn))
-    g.add_device(VirtualVideoDevice(g.conn))
-
-    return g
-
-
-def get_floppy(path=None):
-    if not path:
-        path = "/dev/default-pool/testvol1.img"
-    d = VirtualDisk(_conn)
-    d.path = path
-    d.device = d.DEVICE_FLOPPY
-    d.validate()
-    return d
-
-
-def get_filedisk(path=None):
-    if not path:
-        path = "/dev/default-pool/new-test-suite.img"
-    d = VirtualDisk(_conn)
-    d.path = path
-
-    if d.wants_storage_creation():
-        parent_pool = d.get_parent_pool()
-        vol_install = VirtualDisk.build_vol_install(_conn,
-            os.path.basename(path), parent_pool, .0000001, True)
-        d.set_vol_install(vol_install)
-
-    d.validate()
-    return d
-
-
-def get_blkdisk(path="/dev/disk-pool/diskvol1"):
-    d = VirtualDisk(_conn)
-    d.path = path
-    d.validate()
-    return d
-
-
-def get_virtual_network():
-    dev = virtinst.VirtualNetworkInterface(_conn)
-    dev.macaddr = "22:22:33:44:55:66"
-    dev.type = virtinst.VirtualNetworkInterface.TYPE_VIRTUAL
-    dev.source = "default"
-    return dev
diff --git a/tests/xmlconfig-xml/boot-cpuset.xml b/tests/xmlconfig-xml/boot-cpuset.xml
deleted file mode 100644
index 70580fc2a..000000000
--- a/tests/xmlconfig-xml/boot-cpuset.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu cpuset="0,1,2,3,4,5,6,7">7</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <cpu mode="custom" match="minimum">
-    <model>footest</model>
-    <vendor>Intel</vendor>
-    <topology sockets="4" cores="5" threads="2"/>
-    <feature policy="force" name="x2apic"/>
-    <feature policy="forbid" name="lahf_lm"/>
-  </cpu>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="block" device="cdrom">
-      <target dev="hda" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml b/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml
deleted file mode 100644
index 6a328e3f9..000000000
--- a/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="block" device="disk">
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="block" device="cdrom">
-      <target dev="hdb" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml b/tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml
deleted file mode 100644
index 8559b2765..000000000
--- a/tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="block" device="cdrom">
-      <target dev="hdb" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml b/tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml
deleted file mode 100644
index 1828a2b7f..000000000
--- a/tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="network"/>
-    <bootmenu enable="yes"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml b/tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml
deleted file mode 100644
index c6890df38..000000000
--- a/tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="network"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-fullyvirt-pxe.xml b/tests/xmlconfig-xml/boot-fullyvirt-pxe.xml
deleted file mode 100644
index 457712756..000000000
--- a/tests/xmlconfig-xml/boot-fullyvirt-pxe.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-many-chars.xml b/tests/xmlconfig-xml/boot-many-chars.xml
deleted file mode 100644
index bb0920ef8..000000000
--- a/tests/xmlconfig-xml/boot-many-chars.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="network"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <serial type="null"/>
-    <serial type="tcp">
-      <source mode="bind" host="my.source.host" service="1234"/>
-      <protocol type="telnet"/>
-    </serial>
-    <parallel type="unix">
-      <source mode="bind" path="/dev/default-pool/foobar"/>
-    </parallel>
-    <parallel type="udp">
-      <source mode="bind" host="my.bind.host" service="1111"/>
-      <source mode="connect" host="my.source.host" service="2222"/>
-    </parallel>
-    <console type="pty"/>
-    <console type="pty">
-      <target type="virtio"/>
-    </console>
-    <channel type="pty">
-      <target type="virtio" name="foo.bar.frob"/>
-    </channel>
-    <channel type="pty">
-      <target type="guestfwd" address="1.2.3.4" port="4567"/>
-    </channel>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-many-devices.xml b/tests/xmlconfig-xml/boot-many-devices.xml
deleted file mode 100644
index 468e54e99..000000000
--- a/tests/xmlconfig-xml/boot-many-devices.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <description>foooo barrrr somedesc</description>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <memoryBacking>
-    <hugepages/>
-  </memoryBacking>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="localtime"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="block" device="floppy">
-      <source dev="/dev/null"/>
-      <target dev="fda" bus="fdc"/>
-    </disk>
-    <disk type="block" device="disk">
-      <source dev="/dev/null"/>
-      <target dev="sda" bus="scsi"/>
-    </disk>
-    <disk type="dir" device="floppy">
-      <source dir="/tmp"/>
-      <target dev="fdb" bus="fdc"/>
-    </disk>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/dev/default-pool/testvol1.img"/>
-      <target dev="sdb" bus="scsi"/>
-      <address type="spapr-vio"/>
-    </disk>
-    <controller type="ide" index="3"/>
-    <controller type="virtio-serial" index="0" ports="32" vectors="17"/>
-    <controller type="scsi" index="0">
-      <address type="spapr-vio"/>
-    </controller>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-      <model type="e1000"/>
-    </interface>
-    <interface type="user">
-      <mac address="22:11:11:11:11:11"/>
-    </interface>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:22:22:22:22"/>
-      <model type="spapr-vlan"/>
-      <address type="spapr-vio"/>
-    </interface>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <graphics type="vnc" port="-1" keymap="en-us"/>
-    <graphics type="vnc" port="-1"/>
-    <graphics type="sdl" display=":3.4" xauth="/dev/default-pool/.Xauthority"/>
-    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes" keymap="en-us" passwdValidTo="foobar"/>
-    <graphics type="sdl" display="foodisplay" xauth="fooxauth"/>
-    <serial type="null"/>
-    <parallel type="unix">
-      <source mode="bind" path="/dev/default-pool/foobar"/>
-    </parallel>
-    <console type="pty"/>
-    <channel type="spicevmc">
-      <target type="virtio" name="com.redhat.spice.0"/>
-    </channel>
-    <sound model="sb16"/>
-    <sound model="es1370"/>
-    <video>
-      <model type="vmvga"/>
-    </video>
-    <video>
-      <model type="cirrus" vram="10240" heads="3"/>
-    </video>
-    <video>
-      <model type="qxl"/>
-    </video>
-    <video>
-      <model type="qxl"/>
-    </video>
-    <hostdev mode="subsystem" type="usb" managed="yes">
-      <source>
-        <vendor id="0x4321"/>
-        <product id="0x1234"/>
-      </source>
-    </hostdev>
-    <watchdog model="ib700" action="none"/>
-    <redirdev bus="usb" type="spicevmc"/>
-    <redirdev bus="usb" type="tcp">
-      <source host="foobar.com" service="1234"/>
-    </redirdev>
-    <memballoon model="virtio"/>
-    <panic>
-      <address type="isa" iobase="0x505"/>
-    </panic>
-  </devices>
-  <seclabel type="static" model="selinux">
-    <label>foolabel</label>
-    <imagelabel>imagelabel</imagelabel>
-  </seclabel>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-many-disks2.xml b/tests/xmlconfig-xml/boot-many-disks2.xml
deleted file mode 100644
index a84ac900c..000000000
--- a/tests/xmlconfig-xml/boot-many-disks2.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="block" device="disk">
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="hdb" bus="ide"/>
-    </disk>
-    <disk type="block" device="cdrom">
-      <driver type="raw"/>
-      <source dev="/dev/null"/>
-      <target dev="hdc" bus="ide"/>
-      <readonly/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source dev="/dev/null"/>
-      <target dev="hdd" bus="ide"/>
-    </disk>
-    <disk type="block" device="cdrom">
-      <target dev="sda" bus="scsi"/>
-      <readonly/>
-    </disk>
-    <disk type="block" device="floppy">
-      <target dev="fda" bus="fdc"/>
-      <iotune>
-        <total_bytes_sec>1</total_bytes_sec>
-        <total_iops_sec>2</total_iops_sec>
-      </iotune>
-    </disk>
-    <disk type="block" device="floppy">
-      <driver name="phy" cache="none"/>
-      <source dev="/dev/null"/>
-      <target dev="fdb" bus="fdc"/>
-      <iotune>
-        <read_bytes_sec>5555</read_bytes_sec>
-        <read_iops_sec>1234</read_iops_sec>
-        <write_bytes_sec>3</write_bytes_sec>
-        <write_iops_sec>4</write_iops_sec>
-      </iotune>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="qcow2" cache="none" io="threads"/>
-      <source dev="/dev/null"/>
-      <target dev="vda" bus="virtio"/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-many-hostdevs.xml b/tests/xmlconfig-xml/boot-many-hostdevs.xml
deleted file mode 100644
index 604e273d3..000000000
--- a/tests/xmlconfig-xml/boot-many-hostdevs.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="network"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <hostdev mode="subsystem" type="usb" managed="yes">
-      <source>
-        <vendor id="0x4321"/>
-        <product id="0x1234"/>
-      </source>
-    </hostdev>
-    <hostdev mode="subsystem" type="pci" managed="yes">
-      <source>
-        <address domain="0x0" bus="0x11" slot="0x2" function="0x3"/>
-      </source>
-    </hostdev>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-many-nics.xml b/tests/xmlconfig-xml/boot-many-nics.xml
deleted file mode 100644
index 028d7b097..000000000
--- a/tests/xmlconfig-xml/boot-many-nics.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="network"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <interface type="user">
-      <mac address="22:11:11:11:11:11"/>
-    </interface>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-    </interface>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-      <model type="e1000"/>
-    </interface>
-    <interface type="bridge">
-      <source bridge="foobr0"/>
-      <mac address="22:22:22:22:22:22"/>
-      <target dev="foo1"/>
-    </interface>
-    <interface type="ethernet">
-      <source dev="testeth1"/>
-      <mac address="00:11:00:22:00:33"/>
-    </interface>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-many-sounds.xml b/tests/xmlconfig-xml/boot-many-sounds.xml
deleted file mode 100644
index 7b722997e..000000000
--- a/tests/xmlconfig-xml/boot-many-sounds.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="network"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="sb16"/>
-    <sound model="es1370"/>
-    <sound model="pcspk"/>
-    <sound model="es1370"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-paravirt-disk-block.xml b/tests/xmlconfig-xml/boot-paravirt-disk-block.xml
deleted file mode 100644
index 2f39a3cb2..000000000
--- a/tests/xmlconfig-xml/boot-paravirt-disk-block.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <disk type="block" device="disk">
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-paravirt-disk-drv-file.xml b/tests/xmlconfig-xml/boot-paravirt-disk-drv-file.xml
deleted file mode 100644
index f08d7178a..000000000
--- a/tests/xmlconfig-xml/boot-paravirt-disk-drv-file.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <driver name="file"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml b/tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml
deleted file mode 100644
index 07478c6b4..000000000
--- a/tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <disk type="block" device="disk">
-      <driver name="phy"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap-qcow.xml b/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap-qcow.xml
deleted file mode 100644
index 9d14d9868..000000000
--- a/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap-qcow.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <driver name="tap" type="qcow"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap.xml b/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap.xml
deleted file mode 100644
index 43fafa240..000000000
--- a/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <driver name="tap"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-paravirt-disk-file.xml b/tests/xmlconfig-xml/boot-paravirt-disk-file.xml
deleted file mode 100644
index 14e809693..000000000
--- a/tests/xmlconfig-xml/boot-paravirt-disk-file.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/somerandomfilename.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-paravirt-many-disks.xml b/tests/xmlconfig-xml/boot-paravirt-many-disks.xml
deleted file mode 100644
index 980341666..000000000
--- a/tests/xmlconfig-xml/boot-paravirt-many-disks.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/test1.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <disk type="file" device="disk">
-      <driver name="tap" type="qcow"/>
-      <source file="/dev/default-pool/test2.img"/>
-      <target dev="xvdb" bus="xen"/>
-    </disk>
-    <disk type="block" device="disk">
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="xvdc" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-usb2.xml b/tests/xmlconfig-xml/boot-usb2.xml
deleted file mode 100644
index d8e435711..000000000
--- a/tests/xmlconfig-xml/boot-usb2.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="network"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <controller type="usb" index="0" model="ich9-ehci1"/>
-    <controller type="usb" index="0" model="ich9-uhci1">
-      <master startport="0"/>
-    </controller>
-    <controller type="usb" index="0" model="ich9-uhci2">
-      <master startport="2"/>
-    </controller>
-    <controller type="usb" index="0" model="ich9-uhci3">
-      <master startport="4"/>
-    </controller>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/boot-windowsxp-kvm.xml b/tests/xmlconfig-xml/boot-windowsxp-kvm.xml
deleted file mode 100644
index 3c64d04f5..000000000
--- a/tests/xmlconfig-xml/boot-windowsxp-kvm.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<domain type='kvm'>
-  <name>TestGuest</name>
-  <currentMemory>204800</currentMemory>
-  <memory>409600</memory>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <os>
-    <type arch='i686'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/><apic/>
-  </features>
-  <clock offset="localtime"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <vcpu>5</vcpu>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source file='/tmp/test.img'/>
-      <target dev='hda' bus='ide'/>
-    </disk>
-    <disk type='block' device='disk'>
-      <driver name='qemu'/>
-      <source dev='/dev/null'/>
-      <target dev='hdb' bus='ide'/>
-    </disk>
-    <disk type='block' device='cdrom'>
-      <driver name='qemu'/>
-      <source dev='/dev/null'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-    </disk>
-    <interface type='network'>
-      <source network='default'/>
-      <mac address='22:22:33:44:55:66'/>
-    </interface>
-    <input type='tablet' bus='usb'/>
-    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
-    <console type='pty'/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-f10.xml b/tests/xmlconfig-xml/install-f10.xml
deleted file mode 100644
index d1c31701a..000000000
--- a/tests/xmlconfig-xml/install-f10.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<domain type="kvm">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <boot dev="network"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="vda" bus="virtio"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="vdb" bus="virtio"/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-      <model type="virtio"/>
-    </interface>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-f11-ac97.xml b/tests/xmlconfig-xml/install-f11-ac97.xml
deleted file mode 100644
index 52b1e47f3..000000000
--- a/tests/xmlconfig-xml/install-f11-ac97.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<domain type="kvm">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="floppy">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/dev/default-pool/testvol1.img"/>
-      <target dev="fda" bus="fdc"/>
-    </disk>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="vda" bus="virtio"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="vdb" bus="virtio"/>
-    </disk>
-    <disk type="block" device="cdrom">
-      <target dev="hda" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-      <model type="virtio"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="ac97"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-f11-noac97.xml b/tests/xmlconfig-xml/install-f11-noac97.xml
deleted file mode 100644
index c137aaa10..000000000
--- a/tests/xmlconfig-xml/install-f11-noac97.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<domain type="kvm">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="floppy">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/dev/default-pool/testvol1.img"/>
-      <target dev="fda" bus="fdc"/>
-    </disk>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="vda" bus="virtio"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="vdb" bus="virtio"/>
-    </disk>
-    <disk type="block" device="cdrom">
-      <target dev="hda" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-      <model type="virtio"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="es1370"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-f11-qemu.xml b/tests/xmlconfig-xml/install-f11-qemu.xml
deleted file mode 100644
index f73e8e37b..000000000
--- a/tests/xmlconfig-xml/install-f11-qemu.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<domain type="qemu">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="floppy">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/dev/default-pool/testvol1.img"/>
-      <target dev="fda" bus="fdc"/>
-    </disk>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="vda" bus="virtio"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="vdb" bus="virtio"/>
-    </disk>
-    <disk type="block" device="cdrom">
-      <target dev="hda" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-      <model type="virtio"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-f11-xen.xml b/tests/xmlconfig-xml/install-f11-xen.xml
deleted file mode 100644
index c16b5df05..000000000
--- a/tests/xmlconfig-xml/install-f11-xen.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="floppy">
-      <source file="/dev/default-pool/testvol1.img"/>
-      <target dev="fda" bus="fdc"/>
-    </disk>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="block" device="disk">
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="hdb" bus="ide"/>
-    </disk>
-    <disk type="block" device="cdrom">
-      <target dev="hdc" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-f11.xml b/tests/xmlconfig-xml/install-f11.xml
deleted file mode 100644
index 2f76b0918..000000000
--- a/tests/xmlconfig-xml/install-f11.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<domain type="kvm">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="floppy">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/dev/default-pool/testvol1.img"/>
-      <target dev="fda" bus="fdc"/>
-    </disk>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="vda" bus="virtio"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="vdb" bus="virtio"/>
-    </disk>
-    <disk type="block" device="cdrom">
-      <target dev="hda" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-      <model type="virtio"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml b/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml
deleted file mode 100644
index 0ba00bcb7..000000000
--- a/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="block" device="disk">
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <source file="/dev/null"/>
-      <target dev="hdb" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml b/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml
deleted file mode 100644
index 56f9cebc2..000000000
--- a/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <source file="/dev/null"/>
-      <target dev="hdb" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-import-kernel.xml b/tests/xmlconfig-xml/install-fullyvirt-import-kernel.xml
deleted file mode 100644
index dfdf8e052..000000000
--- a/tests/xmlconfig-xml/install-fullyvirt-import-kernel.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <kernel>/kernel</kernel>
-    <initrd>/initrd</initrd>
-    <cmdline>my kernel args</cmdline>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-import-multiboot.xml b/tests/xmlconfig-xml/install-fullyvirt-import-multiboot.xml
deleted file mode 100644
index b5c77dfab..000000000
--- a/tests/xmlconfig-xml/install-fullyvirt-import-multiboot.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="hd"/>
-    <boot dev="fd"/>
-    <boot dev="cdrom"/>
-    <boot dev="network"/>
-    <bootmenu enable="no"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-import.xml b/tests/xmlconfig-xml/install-fullyvirt-import.xml
deleted file mode 100644
index 457712756..000000000
--- a/tests/xmlconfig-xml/install-fullyvirt-import.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-livecd.xml b/tests/xmlconfig-xml/install-fullyvirt-livecd.xml
deleted file mode 100644
index 17f662f7e..000000000
--- a/tests/xmlconfig-xml/install-fullyvirt-livecd.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="cdrom"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="cdrom">
-      <source file="/dev/null"/>
-      <target dev="hda" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml b/tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml
deleted file mode 100644
index 9d6d7fbb6..000000000
--- a/tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="network"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-pxe.xml b/tests/xmlconfig-xml/install-fullyvirt-pxe.xml
deleted file mode 100644
index 3501b7985..000000000
--- a/tests/xmlconfig-xml/install-fullyvirt-pxe.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="network"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-kvm-keymap-local.xml b/tests/xmlconfig-xml/install-kvm-keymap-local.xml
deleted file mode 100644
index 94c467dc1..000000000
--- a/tests/xmlconfig-xml/install-kvm-keymap-local.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type='kvm'>
-  <name>TestGuest</name>
-  <currentMemory>204800</currentMemory>
-  <memory>409600</memory>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <os>
-    <type arch='i686'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/><apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <vcpu>5</vcpu>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source file='/tmp/test.img'/>
-      <target dev='vda' bus='virtio'/>
-    </disk>
-    <disk type='block' device='cdrom'>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-    </disk>
-    <interface type='network'>
-      <source network='default'/>
-      <mac address='22:22:33:44:55:66'/>
-      <model type='virtio'/>
-    </interface>
-    <input type='tablet' bus='usb'/>
-    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
-    <console type='pty'/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-kvm-keymap-none.xml b/tests/xmlconfig-xml/install-kvm-keymap-none.xml
deleted file mode 100644
index 94c467dc1..000000000
--- a/tests/xmlconfig-xml/install-kvm-keymap-none.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type='kvm'>
-  <name>TestGuest</name>
-  <currentMemory>204800</currentMemory>
-  <memory>409600</memory>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <os>
-    <type arch='i686'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/><apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <vcpu>5</vcpu>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source file='/tmp/test.img'/>
-      <target dev='vda' bus='virtio'/>
-    </disk>
-    <disk type='block' device='cdrom'>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-    </disk>
-    <interface type='network'>
-      <source network='default'/>
-      <mac address='22:22:33:44:55:66'/>
-      <model type='virtio'/>
-    </interface>
-    <input type='tablet' bus='usb'/>
-    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
-    <console type='pty'/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-paravirt-disk-block.xml b/tests/xmlconfig-xml/install-paravirt-disk-block.xml
deleted file mode 100644
index 10785c124..000000000
--- a/tests/xmlconfig-xml/install-paravirt-disk-block.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">linux</type>
-    <kernel>/boot/vmlinuz</kernel>
-    <initrd>/boot/initrd</initrd>
-  </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type="block" device="disk">
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-paravirt-disk-drv-file.xml b/tests/xmlconfig-xml/install-paravirt-disk-drv-file.xml
deleted file mode 100644
index f8c85a799..000000000
--- a/tests/xmlconfig-xml/install-paravirt-disk-drv-file.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">linux</type>
-    <kernel>/boot/vmlinuz</kernel>
-    <initrd>/boot/initrd</initrd>
-  </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <driver name="file"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-paravirt-disk-drv-phy.xml b/tests/xmlconfig-xml/install-paravirt-disk-drv-phy.xml
deleted file mode 100644
index 2d9feb938..000000000
--- a/tests/xmlconfig-xml/install-paravirt-disk-drv-phy.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">linux</type>
-    <kernel>/boot/vmlinuz</kernel>
-    <initrd>/boot/initrd</initrd>
-  </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type="block" device="disk">
-      <driver name="phy"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-paravirt-disk-drv-tap-qcow.xml b/tests/xmlconfig-xml/install-paravirt-disk-drv-tap-qcow.xml
deleted file mode 100644
index 6d6229fff..000000000
--- a/tests/xmlconfig-xml/install-paravirt-disk-drv-tap-qcow.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">linux</type>
-    <kernel>/boot/vmlinuz</kernel>
-    <initrd>/boot/initrd</initrd>
-  </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <driver name="tap" type="qcow"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-paravirt-disk-drv-tap.xml b/tests/xmlconfig-xml/install-paravirt-disk-drv-tap.xml
deleted file mode 100644
index 6ba4ce698..000000000
--- a/tests/xmlconfig-xml/install-paravirt-disk-drv-tap.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">linux</type>
-    <kernel>/boot/vmlinuz</kernel>
-    <initrd>/boot/initrd</initrd>
-  </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <driver name="tap"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-paravirt-disk-file.xml b/tests/xmlconfig-xml/install-paravirt-disk-file.xml
deleted file mode 100644
index 6968e2545..000000000
--- a/tests/xmlconfig-xml/install-paravirt-disk-file.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">linux</type>
-    <kernel>/boot/vmlinuz</kernel>
-    <initrd>/boot/initrd</initrd>
-  </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-paravirt-import.xml b/tests/xmlconfig-xml/install-paravirt-import.xml
deleted file mode 100644
index 48994f26e..000000000
--- a/tests/xmlconfig-xml/install-paravirt-import.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-paravirt-many-disks.xml b/tests/xmlconfig-xml/install-paravirt-many-disks.xml
deleted file mode 100644
index e80b53ead..000000000
--- a/tests/xmlconfig-xml/install-paravirt-many-disks.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">linux</type>
-    <kernel>/boot/vmlinuz</kernel>
-    <initrd>/boot/initrd</initrd>
-  </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/test1.img"/>
-      <target dev="xvda" bus="xen"/>
-    </disk>
-    <disk type="file" device="disk">
-      <driver name="tap" type="qcow"/>
-      <source file="/dev/default-pool/test2.img"/>
-      <target dev="xvdb" bus="xen"/>
-    </disk>
-    <disk type="block" device="disk">
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="xvdc" bus="xen"/>
-    </disk>
-    <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-windowsxp-kvm.xml b/tests/xmlconfig-xml/install-windowsxp-kvm.xml
deleted file mode 100644
index f634e3bba..000000000
--- a/tests/xmlconfig-xml/install-windowsxp-kvm.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<domain type='kvm'>
-  <name>TestGuest</name>
-  <currentMemory>204800</currentMemory>
-  <memory>409600</memory>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <os>
-    <type arch='i686'>hvm</type>
-    <boot dev='cdrom'/>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/><apic/>
-  </features>
-  <clock offset="localtime"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <vcpu>5</vcpu>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source file='/tmp/test.img'/>
-      <target dev='hda' bus='ide'/>
-    </disk>
-    <disk type='block' device='disk'>
-      <driver name='qemu'/>
-      <source dev='/dev/null'/>
-      <target dev='hdb' bus='ide'/>
-    </disk>
-    <disk type='block' device='cdrom'>
-      <driver name='qemu'/>
-      <source dev='/dev/null'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-    </disk>
-    <interface type='network'>
-      <source network='default'/>
-      <mac address='22:22:33:44:55:66'/>
-    </interface>
-    <input type='tablet' bus='usb'/>
-    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
-    <console type='pty'/>
-    <sound model='es1370'/>
-    <video>
-      <model type='vga'/>
-    </video>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-windowsxp-xennew.xml b/tests/xmlconfig-xml/install-windowsxp-xennew.xml
deleted file mode 100644
index b3a9fe0dd..000000000
--- a/tests/xmlconfig-xml/install-windowsxp-xennew.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="localtime"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="block" device="disk">
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="hdb" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <source file="/dev/null"/>
-      <target dev="hdc" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="es1370"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/install-windowsxp-xenold.xml b/tests/xmlconfig-xml/install-windowsxp-xenold.xml
deleted file mode 100644
index 3a2827390..000000000
--- a/tests/xmlconfig-xml/install-windowsxp-xenold.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <clock offset="localtime"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="block" device="disk">
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="hdb" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <source file="/dev/null"/>
-      <target dev="hdc" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="es1370"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/misc-qemu-driver-name.xml b/tests/xmlconfig-xml/misc-qemu-driver-name.xml
deleted file mode 100644
index c193cbd43..000000000
--- a/tests/xmlconfig-xml/misc-qemu-driver-name.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <driver name="qemu"/>
-      <source file="/dev/null"/>
-      <target dev="hdb" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml b/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
deleted file mode 100644
index eb108f846..000000000
--- a/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/dev/default-pool/iso-vol"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <driver name="qemu"/>
-      <source file="/dev/null"/>
-      <target dev="hdb" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/misc-qemu-driver-type.xml b/tests/xmlconfig-xml/misc-qemu-driver-type.xml
deleted file mode 100644
index 31df725ae..000000000
--- a/tests/xmlconfig-xml/misc-qemu-driver-type.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/iscsi-pool/diskvol1"/>
-      <target dev="hdb" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <driver name="qemu"/>
-      <source file="/dev/null"/>
-      <target dev="hdc" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/misc-qemu-iso-disk.xml b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml
deleted file mode 100644
index 3f129adc1..000000000
--- a/tests/xmlconfig-xml/misc-qemu-iso-disk.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/iso-vol"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <driver name="qemu"/>
-      <source file="/dev/null"/>
-      <target dev="hdb" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/misc-xml-escaping.xml b/tests/xmlconfig-xml/misc-xml-escaping.xml
deleted file mode 100644
index d2d1f6dd4..000000000
--- a/tests/xmlconfig-xml/misc-xml-escaping.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type="xen">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <description>foooo barrrr 
- baz &amp;&amp; snarf. '' "" @@$
-</description>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <source file="/dev/default-pool/ISO&amp;'&amp;s"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <source file="/dev/null"/>
-      <target dev="hdb" bus="ide"/>
-      <readonly/>
-    </disk>
-    <input type="mouse" bus="ps2"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/rhel6-kvm-stage1.xml b/tests/xmlconfig-xml/rhel6-kvm-stage1.xml
deleted file mode 100644
index 54e9d1c6e..000000000
--- a/tests/xmlconfig-xml/rhel6-kvm-stage1.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type="kvm">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <kernel>/tmp/virtinst-vmlinuz.</kernel>
-    <initrd>/tmp/virtinst-initrd.img.</initrd>
-    <cmdline>method=tests/cli-test-xml/fakerhel6tree</cmdline>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="floppy">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/dev/default-pool/testvol1.img"/>
-      <target dev="fda" bus="fdc"/>
-    </disk>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/rhel6.img"/>
-      <target dev="vda" bus="virtio"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="vdb" bus="virtio"/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-      <model type="virtio"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="ich6"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/rhel6-kvm-stage2.xml b/tests/xmlconfig-xml/rhel6-kvm-stage2.xml
deleted file mode 100644
index de2731f42..000000000
--- a/tests/xmlconfig-xml/rhel6-kvm-stage2.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<domain type="kvm">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="floppy">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/dev/default-pool/testvol1.img"/>
-      <target dev="fda" bus="fdc"/>
-    </disk>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/rhel6.img"/>
-      <target dev="vda" bus="virtio"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="vdb" bus="virtio"/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-      <model type="virtio"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="ich6"/>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/winxp-kvm-stage1.xml b/tests/xmlconfig-xml/winxp-kvm-stage1.xml
deleted file mode 100644
index 5ad59466e..000000000
--- a/tests/xmlconfig-xml/winxp-kvm-stage1.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<domain type="kvm">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <hyperv>
-      <relaxed state="on"/>
-      <vapic state="on"/>
-      <spinlocks state="on" retries="8191"/>
-    </hyperv>
-  </features>
-  <clock offset="localtime">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-    <timer name="hypervclock" present="yes"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/winxp.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="hdb" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <driver name="qemu"/>
-      <source file="/dev/null"/>
-      <target dev="hdc" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="ich6"/>
-    <video>
-      <model type="vga"/>
-    </video>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/winxp-kvm-stage2.xml b/tests/xmlconfig-xml/winxp-kvm-stage2.xml
deleted file mode 100644
index 286686236..000000000
--- a/tests/xmlconfig-xml/winxp-kvm-stage2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<domain type="kvm">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <hyperv>
-      <relaxed state="on"/>
-      <vapic state="on"/>
-      <spinlocks state="on" retries="8191"/>
-    </hyperv>
-  </features>
-  <clock offset="localtime">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-    <timer name="hypervclock" present="yes"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/winxp.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="hdb" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <driver name="qemu"/>
-      <source file="/dev/null"/>
-      <target dev="hdc" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="ich6"/>
-    <video>
-      <model type="vga"/>
-    </video>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig-xml/winxp-kvm-stage3.xml b/tests/xmlconfig-xml/winxp-kvm-stage3.xml
deleted file mode 100644
index 4fb045789..000000000
--- a/tests/xmlconfig-xml/winxp-kvm-stage3.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<domain type="kvm">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <hyperv>
-      <relaxed state="on"/>
-      <vapic state="on"/>
-      <spinlocks state="on" retries="8191"/>
-    </hyperv>
-  </features>
-  <clock offset="localtime">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-    <timer name="hypervclock" present="yes"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/winxp.img"/>
-      <target dev="hda" bus="ide"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="hdb" bus="ide"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <driver name="qemu"/>
-      <source file="/dev/null"/>
-      <target dev="hdc" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="ich6"/>
-    <video>
-      <model type="vga"/>
-    </video>
-  </devices>
-</domain>
diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py
index bf794726d..44e755eb3 100644
--- a/tests/xmlconfig.py
+++ b/tests/xmlconfig.py
@@ -17,948 +17,114 @@
 
 import unittest
 import os
-import logging
 
 import virtinst
 from virtinst import VirtualDisk
-from virtinst import VirtualAudio
-from virtinst import VirtualNetworkInterface
-from virtinst import VirtualHostDevice
-from virtinst import (VirtualChannelDevice, VirtualConsoleDevice,
-                      VirtualParallelDevice, VirtualSerialDevice)
-from virtinst import VirtualVideoDevice
-from virtinst import VirtualController
-from virtinst import VirtualWatchdog
-from virtinst import VirtualMemballoon
-from virtinst import VirtualPanicDevice
 
 from tests import utils
 
-# pylint: disable=protected-access
-# Access to protected member, needed to unittest stuff
 
-_testconn = utils.open_testdriver()
-_kvmconn = utils.open_testkvmdriver()
-_plainkvm = utils.open_plainkvm()
-_plainxen = utils.open_plainxen()
+_default_conn = utils.open_testdriver()
 
 
-def qemu_uri():
-    return "qemu:///system"
+def _make_guest(installer=None, conn=None):
+    if conn is None:
+        conn = _default_conn
+
+    g = virtinst.Guest(conn)
+    g.type = "kvm"
+    g.name = "TestGuest"
+    g.memory = int(200 * 1024)
+    g.maxmemory = int(400 * 1024)
+    g.uuid = "12345678-1234-1234-1234-123456789012"
+    gdev = virtinst.VirtualGraphics(conn)
+    gdev.type = "vnc"
+    gdev.keymap = "ja"
+    g.add_device(gdev)
+    g.features.pae = False
+    g.vcpus = 5
+
+    if not installer:
+        installer = _make_installer(conn=conn)
+    g.installer = installer
+    g.emulator = "/usr/lib/xen/bin/qemu-dm"
+    g.os.arch = "i686"
+    g.os.os_type = "hvm"
+
+    g.add_default_input_device()
+    g.add_default_console_device()
+    g.add_device(virtinst.VirtualAudio(g.conn))
+
+    # Floppy disk
+    path = "/dev/default-pool/testvol1.img"
+    d = VirtualDisk(conn)
+    d.path = path
+    d.device = d.DEVICE_FLOPPY
+    d.validate()
+    g.add_device(d)
+
+    # File disk
+    path = "/dev/default-pool/new-test-suite.img"
+    d = virtinst.VirtualDisk(conn)
+    d.path = path
+
+    if d.wants_storage_creation():
+        parent_pool = d.get_parent_pool()
+        vol_install = virtinst.VirtualDisk.build_vol_install(conn,
+            os.path.basename(path), parent_pool, .0000001, True)
+        d.set_vol_install(vol_install)
+
+    d.validate()
+    g.add_device(d)
+
+    # Block disk
+    path = "/dev/disk-pool/diskvol1"
+    d = virtinst.VirtualDisk(conn)
+    d.path = path
+    d.validate()
+    g.add_device(d)
+
+    # Network device
+    dev = virtinst.VirtualNetworkInterface(conn)
+    dev.macaddr = "22:22:33:44:55:66"
+    dev.type = virtinst.VirtualNetworkInterface.TYPE_VIRTUAL
+    dev.source = "default"
+    g.add_device(dev)
+
+    return g
 
 
-def xen_uri():
-    return "xen:///"
+def _make_installer(location=None, conn=None):
+    conn = conn or _default_conn
+    inst = virtinst.DistroInstaller(conn)
+    if location:
+        inst.location = location
+    else:
+        inst.location = "/dev/null"
+        inst.cdrom = True
+    return inst
 
 
-def build_xmlfile(filebase):
-    if not filebase:
-        return None
-    return os.path.join("tests/xmlconfig-xml", filebase + ".xml")
+class TestXMLMisc(unittest.TestCase):
+    """
+    Misc tests for various XML special behavior. These should only aim for
+    testing any particularly tricky bits, general XML generation should
+    be through virt-install examples in clitest
+    """
+    def _compare(self, guest, filebase, do_install):
+        filename = os.path.join("tests/xmlconfig-xml", filebase + ".xml")
 
-
-class TestXMLConfig(unittest.TestCase):
-
-    def setUp(self):
-        utils.reset_conn()
-        logging.debug("Running %s", self.id())
-
-    def _compare(self, guest, filebase, do_install, do_disk_boot=False,
-                 do_create=True):
-        filename = filebase and build_xmlfile(filebase) or None
-
-        cont_xml = None
         inst_xml, boot_xml = guest.start_install(return_xml=True, dry=True)
-        if do_disk_boot:
-            cont_xml, boot_xml = guest.continue_install(return_xml=True,
-                                                        dry=True)
-
-        if do_disk_boot:
-            actualXML = cont_xml
-        elif do_install:
+        if do_install:
             actualXML = inst_xml
         else:
             actualXML = boot_xml
 
-        if filename:
-            utils.diff_compare(actualXML, filename)
-        if do_create:
-            utils.test_create(guest.conn, actualXML)
-
-    def _testInstall(self, guest,
-                     instxml=None, bootxml=None, contxml=None,
-                     detect_distro=False):
-        instname = build_xmlfile(instxml)
-        bootname = build_xmlfile(bootxml)
-        contname = build_xmlfile(contxml)
-        meter = None
-
-        try:
-            if detect_distro:
-                guest.os_variant = guest.installer.detect_distro(guest)
-
-            guest.start_install(meter=meter)
-            guest.domain.destroy()
-
-            xmlinst = guest.get_install_xml(True, False)
-            xmlboot = guest.get_install_xml(False, False)
-            xmlcont = guest.get_install_xml(True, True)
-
-            if instname:
-                utils.diff_compare(xmlinst, instname)
-            if contname:
-                utils.diff_compare(xmlcont, contname)
-            if bootname:
-                utils.diff_compare(xmlboot, bootname)
-
-            if guest.get_continue_inst():
-                guest.continue_install(meter=meter)
-
-        finally:
-            try:
-                guest.domain.destroy()
-            except:
-                pass
-            try:
-                guest.domain.undefine()
-            except:
-                pass
-
-
-    def testBootParavirtDiskFile(self):
-        g = utils.get_basic_paravirt_guest()
-        g.add_device(utils.get_filedisk("/dev/default-pool/somerandomfilename.img"))
-        self._compare(g, "boot-paravirt-disk-file", False)
-
-    def testBootParavirtDiskFileBlktapCapable(self):
-        oldblktap = virtinst.util.is_blktap_capable
-        try:
-            virtinst.util.is_blktap_capable = lambda ignore: True
-            g = utils.get_basic_paravirt_guest()
-            g.add_device(utils.get_filedisk())
-            self._compare(g, "boot-paravirt-disk-drv-tap", False)
-        finally:
-            virtinst.util.is_blktap_capable = oldblktap
-
-    def testBootParavirtDiskBlock(self):
-        g = utils.get_basic_paravirt_guest()
-        g.add_device(utils.get_blkdisk())
-        self._compare(g, "boot-paravirt-disk-block", False)
-
-    def testBootParavirtDiskDrvPhy(self):
-        g = utils.get_basic_paravirt_guest()
-        disk = utils.get_blkdisk()
-        disk.driver_name = VirtualDisk.DRIVER_PHY
-        g.add_device(disk)
-        self._compare(g, "boot-paravirt-disk-drv-phy", False)
-
-    def testBootParavirtDiskDrvFile(self):
-        g = utils.get_basic_paravirt_guest()
-        disk = utils.get_filedisk()
-        disk.driver_name = VirtualDisk.DRIVER_FILE
-        g.add_device(disk)
-        self._compare(g, "boot-paravirt-disk-drv-file", False)
-
-    def testBootParavirtDiskDrvTap(self):
-        g = utils.get_basic_paravirt_guest()
-        disk = utils.get_filedisk()
-        disk.driver_name = VirtualDisk.DRIVER_TAP
-        g.add_device(disk)
-        self._compare(g, "boot-paravirt-disk-drv-tap", False)
-
-    def testBootParavirtDiskDrvTapQCow(self):
-        g = utils.get_basic_paravirt_guest()
-        disk = utils.get_filedisk()
-        disk.driver_name = VirtualDisk.DRIVER_TAP
-        disk.driver_type = VirtualDisk.DRIVER_TAP_QCOW
-        g.add_device(disk)
-        self._compare(g, "boot-paravirt-disk-drv-tap-qcow", False)
-
-    def testBootParavirtManyDisks(self):
-        g = utils.get_basic_paravirt_guest()
-        disk = utils.get_filedisk("/dev/default-pool/test2.img")
-        disk.driver_name = VirtualDisk.DRIVER_TAP
-        disk.driver_type = VirtualDisk.DRIVER_TAP_QCOW
-
-        g.add_device(utils.get_filedisk("/dev/default-pool/test1.img"))
-        g.add_device(disk)
-        g.add_device(utils.get_blkdisk())
-        self._compare(g, "boot-paravirt-many-disks", False)
-
-    def testBootFullyvirtDiskFile(self):
-        g = utils.get_basic_fullyvirt_guest()
-        g.add_device(utils.get_filedisk())
-        self._compare(g, "boot-fullyvirt-disk-file", False)
-
-    def testBootFullyvirtDiskBlock(self):
-        g = utils.get_basic_fullyvirt_guest()
-        g.add_device(utils.get_blkdisk())
-        self._compare(g, "boot-fullyvirt-disk-block", False)
-
-
-
-    def testInstallParavirtDiskFile(self):
-        g = utils.get_basic_paravirt_guest()
-        g.add_device(utils.get_filedisk())
-        self._compare(g, "install-paravirt-disk-file", True)
-
-    def testInstallParavirtDiskBlock(self):
-        g = utils.get_basic_paravirt_guest()
-        g.add_device(utils.get_blkdisk())
-        self._compare(g, "install-paravirt-disk-block", True)
-
-    def testInstallParavirtDiskDrvPhy(self):
-        g = utils.get_basic_paravirt_guest()
-        disk = utils.get_blkdisk()
-        disk.driver_name = VirtualDisk.DRIVER_PHY
-        g.add_device(disk)
-        self._compare(g, "install-paravirt-disk-drv-phy", True)
-
-    def testInstallParavirtDiskDrvFile(self):
-        g = utils.get_basic_paravirt_guest()
-        disk = utils.get_filedisk()
-        disk.driver_name = VirtualDisk.DRIVER_FILE
-        g.add_device(disk)
-        self._compare(g, "install-paravirt-disk-drv-file", True)
-
-    def testInstallParavirtDiskDrvTap(self):
-        g = utils.get_basic_paravirt_guest()
-        disk = utils.get_filedisk()
-        disk.driver_name = VirtualDisk.DRIVER_TAP
-        g.add_device(disk)
-        self._compare(g, "install-paravirt-disk-drv-tap", True)
-
-    def testInstallParavirtDiskDrvTapQCow(self):
-        g = utils.get_basic_paravirt_guest()
-        disk = utils.get_filedisk()
-        disk.driver_name = VirtualDisk.DRIVER_TAP
-        disk.driver_type = VirtualDisk.DRIVER_TAP_QCOW
-        g.add_device(disk)
-        self._compare(g, "install-paravirt-disk-drv-tap-qcow", True)
-
-    def testInstallParavirtManyDisks(self):
-        g = utils.get_basic_paravirt_guest()
-        disk = utils.get_filedisk("/dev/default-pool/test2.img")
-        disk.driver_name = VirtualDisk.DRIVER_TAP
-        disk.driver_type = VirtualDisk.DRIVER_TAP_QCOW
-
-        g.add_device(utils.get_filedisk("/dev/default-pool/test1.img"))
-        g.add_device(disk)
-        g.add_device(utils.get_blkdisk())
-        self._compare(g, "install-paravirt-many-disks", True)
-
-    def testInstallFullyvirtDiskFile(self):
-        g = utils.get_basic_fullyvirt_guest()
-        g.add_device(utils.get_filedisk())
-        self._compare(g, "install-fullyvirt-disk-file", True)
-
-    def testInstallFullyvirtDiskBlock(self):
-        g = utils.get_basic_fullyvirt_guest()
-        g.add_device(utils.get_blkdisk())
-        self._compare(g, "install-fullyvirt-disk-block", True)
-
-    def testInstallFVPXE(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-        g.add_device(utils.get_filedisk())
-        self._compare(g, "install-fullyvirt-pxe", True)
-
-    def testBootFVPXE(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-        g.add_device(utils.get_filedisk())
-        self._compare(g, "boot-fullyvirt-pxe", False)
-
-    def testBootFVPXEAlways(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-        g.add_device(utils.get_filedisk())
-
-        g.os.bootorder = [
-            g.os.BOOT_DEVICE_NETWORK]
-        g.os.enable_bootmenu = True
-
-        self._compare(g, "boot-fullyvirt-pxe-always", False)
-
-    def testInstallFVPXENoDisks(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-        self._compare(g, "install-fullyvirt-pxe-nodisks", True)
-
-    def testBootFVPXENoDisks(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-        self._compare(g, "boot-fullyvirt-pxe-nodisks", False)
-
-    def testInstallFVLiveCD(self):
-        i = utils.make_live_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-        self._compare(g, "install-fullyvirt-livecd", False)
-
-    def testDoubleInstall(self):
-        # Make sure that installing twice generates the same XML, to ensure
-        # we aren't polluting the device list during the install process
-        i = utils.make_live_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-        self._compare(g, "install-fullyvirt-livecd", False)
-        self._compare(g, "install-fullyvirt-livecd", False)
-
-    def testOSDeviceDefaultChange(self):
-        """
-        Make sure device defaults are properly changed if we change OS
-        distro/variant mid process
-        """
-        conn = utils.open_plainkvm(connver=12005)
-        utils.set_conn(conn)
-
-        i = utils.make_distro_installer()
-        g = utils.get_basic_fullyvirt_guest("kvm", installer=i)
-
-        do_install = False
-        g.installer.cdrom = True
-        g.add_device(utils.get_floppy())
-        g.add_device(utils.get_filedisk())
-        g.add_device(utils.get_blkdisk())
-        g.add_device(utils.get_virtual_network())
-        g.add_device(VirtualAudio(g.conn))
-
-        # Call get_xml_config sets first round of defaults w/o os_variant set
-        g.get_install_xml(do_install)
-
-        g.os_variant = "fedora11"
-        self._compare(g, "install-f11-norheldefaults", do_install)
-
-        try:
-            virtinst.stable_defaults = True
-            origemu = g.emulator
-            g.emulator = "/usr/libexec/qemu-kvm"
-            g.conn._support_cache = {}
-            self._compare(g, "install-f11-rheldefaults", do_install)
-            g.emulator = origemu
-            g.conn._support_cache = {}
-        finally:
-            virtinst.stable_defaults = False
-
-        # Verify main guest wasn't polluted
-        self._compare(g, "install-f11-norheldefaults", do_install)
-
-    def testInstallFVImport(self):
-        i = utils.make_import_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-
-        g.add_device(utils.get_filedisk())
-        self._compare(g, "install-fullyvirt-import", False)
-
-    def testInstallFVImportKernel(self):
-        i = utils.make_import_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-
-        g.add_device(utils.get_filedisk())
-        g.os.kernel = "/kernel"
-        g.os.initrd = "/initrd"
-        g.os.kernel_args = "my kernel args"
-
-        self._compare(g, "install-fullyvirt-import-kernel", False)
-
-    def testInstallFVImportMulti(self):
-        i = utils.make_import_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-
-        g.os.enable_bootmenu = False
-        g.os.bootorder = ["hd", "fd", "cdrom", "network"]
-        g.add_device(utils.get_filedisk())
-        self._compare(g, "install-fullyvirt-import-multiboot", False)
-
-    def testInstallPVImport(self):
-        i = utils.make_import_installer()
-        g = utils.get_basic_paravirt_guest(installer=i)
-
-        g.add_device(utils.get_filedisk())
-        self._compare(g, "install-paravirt-import", False)
-
-    def testQEMUDriverName(self):
-        utils.set_conn(_plainkvm)
-        g = utils.get_basic_fullyvirt_guest()
-        g.add_device(utils.get_blkdisk())
-        self._compare(g, "misc-qemu-driver-name", True)
-
-        g = utils.get_basic_fullyvirt_guest()
-        g.add_device(utils.get_filedisk())
-        g.add_device(utils.get_blkdisk("/iscsi-pool/diskvol1"))
-        self._compare(g, "misc-qemu-driver-type", True)
-
-        g = utils.get_basic_fullyvirt_guest()
-        g.add_device(utils.get_filedisk("/dev/default-pool/iso-vol"))
-        self._compare(g, "misc-qemu-iso-disk", True)
-
-        g = utils.get_basic_fullyvirt_guest()
-        g.add_device(utils.get_filedisk("/dev/default-pool/iso-vol"))
-        g.get_devices("disk")[0].driver_type = "qcow2"
-        self._compare(g, "misc-qemu-driver-overwrite", True)
-
-    def testXMLEscaping(self):
-        g = utils.get_basic_fullyvirt_guest()
-        g.description = "foooo barrrr \n baz && snarf. '' \"\" @@$\n"
-        g.add_device(utils.get_filedisk("/dev/default-pool/ISO&'&s"))
-        self._compare(g, "misc-xml-escaping", True)
-
-    # OS Type/Version configurations
-    def testF10(self):
-        utils.set_conn(_plainkvm)
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest("kvm", installer=i)
-
-        g.os_variant = "fedora10"
-        g.add_device(utils.get_filedisk())
-        g.add_device(utils.get_blkdisk())
-        g.add_device(utils.get_virtual_network())
-        self._compare(g, "install-f10", True)
-
-    def testF11(self):
-        utils.set_conn(_plainkvm)
-        i = utils.make_distro_installer()
-        g = utils.get_basic_fullyvirt_guest("kvm", installer=i)
-        g.os.os_type = "hvm"
-
-        g.os_variant = "fedora11"
-        g.installer.cdrom = True
-        g.add_device(utils.get_floppy())
-        g.add_device(utils.get_filedisk())
-        g.add_device(utils.get_blkdisk())
-        g.add_device(utils.get_virtual_network())
-        self._compare(g, "install-f11", False)
-
-    def testF11AC97(self):
-        def build_guest():
-            i = utils.make_distro_installer()
-            g = utils.get_basic_fullyvirt_guest("kvm", installer=i)
-
-            g.os_variant = "fedora11"
-            g.installer.cdrom = True
-            g.add_device(utils.get_floppy())
-            g.add_device(utils.get_filedisk())
-            g.add_device(utils.get_blkdisk())
-            g.add_device(utils.get_virtual_network())
-            g.add_device(VirtualAudio(g.conn))
-            return g
-
-        utils.set_conn(utils.open_plainkvm(connver=11000))
-        g = build_guest()
-        self._compare(g, "install-f11-ac97", False)
-
-        utils.set_conn(utils.open_plainkvm(libver=5000))
-        g = build_guest()
-        self._compare(g, "install-f11-noac97", False)
-
-        utils.set_conn(utils.open_plainkvm(libver=7000, connver=7000))
-        g = build_guest()
-        self._compare(g, "install-f11-noac97", False)
-
-    def testKVMKeymap(self):
-        conn = utils.open_plainkvm(connver=10000)
-        g = virtinst.VirtualGraphics(conn)
-        g.type = "vnc"
-        self.assertTrue(g.keymap is not None)
-
-        conn = utils.open_plainkvm(connver=11000)
-        g = virtinst.VirtualGraphics(conn)
-        g.type = "vnc"
-        self.assertTrue(g.keymap is None)
-
-
-    def testF11Qemu(self):
-        utils.set_conn(_plainkvm)
-        i = utils.make_distro_installer()
-        g = utils.get_basic_fullyvirt_guest("qemu", installer=i)
-
-        g.os_variant = "fedora11"
-        g.installer.cdrom = True
-        g.add_device(utils.get_floppy())
-        g.add_device(utils.get_filedisk())
-        g.add_device(utils.get_blkdisk())
-        g.add_device(utils.get_virtual_network())
-        self._compare(g, "install-f11-qemu", False)
-
-    def testF11Xen(self):
-        utils.set_conn(_plainxen)
-        i = utils.make_distro_installer()
-        g = utils.get_basic_fullyvirt_guest("xen", installer=i)
-
-        g.os_variant = "fedora11"
-        g.installer.cdrom = True
-        g.add_device(utils.get_floppy())
-        g.add_device(utils.get_filedisk())
-        g.add_device(utils.get_blkdisk())
-        g.add_device(utils.get_virtual_network())
-        self._compare(g, "install-f11-xen", False)
-
-    def testInstallWindowsKVM(self):
-        utils.set_conn(_plainkvm)
-        g = utils.build_win_kvm("/dev/default-pool/winxp.img")
-        self._compare(g, "winxp-kvm-stage1", True)
-
-    def testContinueWindowsKVM(self):
-        utils.set_conn(_plainkvm)
-        g = utils.build_win_kvm("/dev/default-pool/winxp.img")
-        self._compare(g, "winxp-kvm-stage2", True, True)
-
-    def testBootWindowsKVM(self):
-        utils.set_conn(_plainkvm)
-        g = utils.build_win_kvm("/dev/default-pool/winxp.img")
-        self._compare(g, "winxp-kvm-stage3", False)
-
-
-    def testInstallWindowsXenNew(self):
-        def make_guest():
-            g = utils.get_basic_fullyvirt_guest("xen")
-            g.os_variant = "winxp"
-            g.add_device(utils.get_filedisk())
-            g.add_device(utils.get_blkdisk())
-            g.add_device(utils.get_virtual_network())
-            g.add_device(VirtualAudio(g.conn))
-            return g
-
-        utils.set_conn(utils.open_plainxen(connver=3000001))
-        g = make_guest()
-        self._compare(g, "install-windowsxp-xenold", True)
-
-        utils.set_conn(utils.open_plainxen(connver=3100000))
-        g = make_guest()
-        self._compare(g, "install-windowsxp-xennew", True)
-
-    # Device heavy configurations
-    def testManyDisks2(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-
-        g.add_device(utils.get_filedisk())
-        g.add_device(utils.get_blkdisk())
-
-        d = VirtualDisk(g.conn)
-        d.type = "block"
-        d.path = "/dev/null"
-        d.device = d.DEVICE_CDROM
-        d.driver_type = "raw"
-        d.validate()
-        g.add_device(d)
-
-        d = VirtualDisk(g.conn)
-        d.type = "block"
-        d.path = "/dev/null"
-        d.device = d.DEVICE_DISK
-        d.driver_name = "qemu"
-        d.validate()
-        g.add_device(d)
-
-        d = VirtualDisk(g.conn)
-        d.path = None
-        d.device = d.DEVICE_CDROM
-        d.bus = "scsi"
-        d.validate()
-        g.add_device(d)
-
-        d = VirtualDisk(g.conn)
-        d.path = None
-        d.device = d.DEVICE_FLOPPY
-        d.iotune_tbs = 1
-        d.iotune_tis = 2
-        d.validate()
-        g.add_device(d)
-
-        d = VirtualDisk(g.conn)
-        d.type = "block"
-        d.path = "/dev/null"
-        d.device = d.DEVICE_FLOPPY
-        d.driver_name = "phy"
-        d.driver_cache = "none"
-        d.iotune_rbs = 5555
-        d.iotune_ris = 1234
-        d.iotune_wbs = 3
-        d.iotune_wis = 4
-        d.validate()
-        g.add_device(d)
-
-        d = VirtualDisk(g.conn)
-        d.type = "block"
-        d.path = "/dev/null"
-        d.bus = "virtio"
-        d.driver_name = "qemu"
-        d.driver_type = "qcow2"
-        d.driver_cache = "none"
-        d.driver_io = "threads"
-        d.validate()
-        g.add_device(d)
-
-        self._compare(g, "boot-many-disks2", False)
-
-    def testManyNICs(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-
-        net1 = VirtualNetworkInterface(g.conn)
-        net1.type = "user"
-        net1.macaddr = "22:11:11:11:11:11"
-
-        net2 = utils.get_virtual_network()
-        net3 = utils.get_virtual_network()
-        net3.model = "e1000"
-
-        net4 = VirtualNetworkInterface(g.conn)
-        net4.source = "foobr0"
-        net4.macaddr = "22:22:22:22:22:22"
-        net4.target_dev = "foo1"
-
-        net5 = VirtualNetworkInterface(g.conn)
-        net5.type = "ethernet"
-        net5.macaddr = "00:11:00:22:00:33"
-        net5.source = "testeth1"
-
-        g.add_device(net1)
-        g.add_device(net2)
-        g.add_device(net3)
-        g.add_device(net4)
-        g.add_device(net5)
-        self._compare(g, "boot-many-nics", False)
-
-    def testManyHostdevs(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-
-        dev1 = VirtualHostDevice(g.conn)
-        dev1.type = "usb"
-        dev1.product = "0x1234"
-        dev1.vendor = "0x4321"
-
-        dev2 = VirtualHostDevice(g.conn)
-        dev2.type = "pci"
-        dev2.bus = "0x11"
-        dev2.slot = "0x2"
-        dev2.function = "0x3"
-
-        g.add_device(dev1)
-        g.add_device(dev2)
-        self._compare(g, "boot-many-hostdevs", False)
-
-    def testManySounds(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-
-        d = VirtualAudio(g.conn)
-        d.model = "sb16"
-        g.add_device(d)
-
-        d = VirtualAudio(g.conn)
-        d.model = "es1370"
-        g.add_device(d)
-
-        d = VirtualAudio(g.conn)
-        d.model = "pcspk"
-        g.add_device(d)
-
-        d = VirtualAudio(g.conn)
-        g.add_device(d)
-
-        self._compare(g, "boot-many-sounds", False)
-
-    def testManyChars(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-
-        dev = VirtualSerialDevice(g.conn)
-        dev.type = "null"
-        g.add_device(dev)
-
-        dev = VirtualParallelDevice(g.conn)
-        dev.type = "unix"
-        dev.source_path = "/dev/default-pool/foobar"
-        g.add_device(dev)
-
-        dev = VirtualSerialDevice(g.conn)
-        dev.type = "tcp"
-        dev.protocol = "telnet"
-        dev.source_host = "my.source.host"
-        dev.source_port = "1234"
-        g.add_device(dev)
-
-        dev = VirtualParallelDevice(g.conn)
-        dev.type = "udp"
-        dev.bind_host = "my.bind.host"
-        dev.bind_port = "1111"
-        dev.source_host = "my.source.host"
-        dev.source_port = "2222"
-        g.add_device(dev)
-
-        dev = VirtualChannelDevice(g.conn)
-        dev.type = "pty"
-        dev.target_type = dev.CHANNEL_TARGET_VIRTIO
-        dev.target_name = "foo.bar.frob"
-        g.add_device(dev)
-
-        dev = VirtualConsoleDevice(g.conn)
-        dev.type = "pty"
-        dev.target_type = dev.CONSOLE_TARGET_VIRTIO
-        g.add_device(dev)
-
-        dev = VirtualChannelDevice(g.conn)
-        dev.type = "pty"
-        dev.target_type = dev.CHANNEL_TARGET_GUESTFWD
-        dev.target_address = "1.2.3.4"
-        dev.target_port = "4567"
-        g.add_device(dev)
-
-        self._compare(g, "boot-many-chars", False)
-
-    def testManyDevices(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-
-        g.description = "foooo barrrr somedesc"
-        g.memoryBacking.hugepages = True
-
-        # Hostdevs
-        dev1 = VirtualHostDevice(g.conn)
-        dev1.type = "usb"
-        dev1.vendor = "0x4321"
-        dev1.product = "0x1234"
-        g.add_device(dev1)
-
-        # Sound devices
-        d = VirtualAudio(g.conn)
-        d.model = "sb16"
-        g.add_device(d)
-
-        d = VirtualAudio(g.conn)
-        d.model = "es1370"
-        g.add_device(d)
-
-        # Disk devices
-        d = VirtualDisk(g.conn)
-        d.type = "block"
-        d.path = "/dev/null"
-        d.device = d.DEVICE_FLOPPY
-        d.validate()
-        g.add_device(d)
-
-        d = VirtualDisk(g.conn)
-        d.type = "block"
-        d.path = "/dev/null"
-        d.bus = "scsi"
-        d.validate()
-        g.add_device(d)
-
-        d = VirtualDisk(g.conn)
-        d.path = "/tmp"
-        d.device = d.DEVICE_FLOPPY
-        d.validate()
-        g.add_device(d)
-
-        d = VirtualDisk(g.conn)
-        d.path = "/dev/default-pool/testvol1.img"
-        d.bus = "scsi"
-        d.driver_name = "qemu"
-        d.address.type = "spapr-vio"
-        d.validate()
-        g.add_device(d)
-
-        # Controller devices
-        c1 = VirtualController(g.conn)
-        c1.type = "ide"
-        c1.index = "3"
-        c2 = VirtualController(g.conn)
-        c2.type = "virtio-serial"
-        c2.ports = "32"
-        c2.vectors = "17"
-        g.add_device(c1)
-        g.add_device(c2)
-
-        # Network devices
-        net1 = utils.get_virtual_network()
-        net1.model = "e1000"
-
-        net2 = VirtualNetworkInterface(g.conn)
-        net2.type = "user"
-        net2.macaddr = "22:11:11:11:11:11"
-        net3 = VirtualNetworkInterface(g.conn)
-        net3.type = virtinst.VirtualNetworkInterface.TYPE_VIRTUAL
-        net3.macaddr = "22:22:22:22:22:22"
-        net3.source = "default"
-        net3.model = "spapr-vlan"
-        net3.address.set_addrstr("spapr-vio")
-        g.add_device(net1)
-        g.add_device(net2)
-        g.add_device(net3)
-
-        # Character devices
-        cdev1 = VirtualSerialDevice(g.conn)
-        cdev1.type = "null"
-        cdev2 = VirtualParallelDevice(g.conn)
-        cdev2.type = "unix"
-        cdev2.source_path = "/dev/default-pool/foobar"
-        cdev3 = VirtualChannelDevice(g.conn)
-        cdev3.type = "spicevmc"
-        g.add_device(cdev1)
-        g.add_device(cdev2)
-        g.add_device(cdev3)
-
-        # Video Devices
-        vdev1 = VirtualVideoDevice(g.conn)
-        vdev1.model = "vmvga"
-
-        vdev2 = VirtualVideoDevice(g.conn)
-        vdev2.model = "cirrus"
-        vdev2.vram = 10 * 1024
-        vdev2.heads = 3
-
-        vdev3 = VirtualVideoDevice(g.conn)
-        vdev4 = VirtualVideoDevice(g.conn)
-        vdev4.model = "qxl"
-
-        g.add_device(vdev1)
-        g.add_device(vdev2)
-        g.add_device(vdev3)
-        g.add_device(vdev4)
-
-        # Watchdog Devices
-        wdev2 = VirtualWatchdog(g.conn)
-        wdev2.model = "ib700"
-        wdev2.action = "none"
-        g.add_device(wdev2)
-
-        # Memballoon Devices
-        mdev1 = VirtualMemballoon(g.conn)
-        mdev1.model = "virtio"
-        g.add_device(mdev1)
-
-        # Check keymap autoconfig
-        gdev1 = virtinst.VirtualGraphics(g.conn)
-        gdev1.type = "vnc"
-        self.assertTrue(gdev1.keymap is not None)
-        gdev1.keymap = "en-us"
-
-        # Check keymap None
-        gdev2 = virtinst.VirtualGraphics(g.conn)
-        gdev2.type = "vnc"
-        gdev2.keymap = None
-
-        gdev3 = virtinst.VirtualGraphics(g.conn)
-        gdev3.type = "sdl"
-        gdev3.xauth = "/dev/default-pool/.Xauthority"
-        gdev3.display = ":3.4"
-        gdev4 = virtinst.VirtualGraphics(g.conn)
-        gdev4.type = "spice"
-        gdev4.passwdValidTo = "foobar"
-
-        gdev5 = virtinst.VirtualGraphics(g.conn)
-        gdev5.type = "sdl"
-        gdev5.xauth = "fooxauth"
-        gdev5.display = "foodisplay"
-        g.add_device(gdev1)
-        g.add_device(gdev2)
-        g.add_device(gdev3)
-        g.add_device(gdev4)
-        g.add_device(gdev5)
-
-        g.clock.offset = "localtime"
-
-        g.seclabel.type = g.seclabel.TYPE_STATIC
-        g.seclabel.model = "selinux"
-        g.seclabel.label = "foolabel"
-        g.seclabel.imagelabel = "imagelabel"
-
-        redir1 = virtinst.VirtualRedirDevice(g.conn)
-        redir1.type = "spicevmc"
-
-        redir2 = virtinst.VirtualRedirDevice(g.conn)
-        redir2.type = "tcp"
-        redir2.parse_friendly_server("foobar.com:1234")
-        g.add_device(redir1)
-        g.add_device(redir2)
-
-        # Panic Notifier device
-        pdev = VirtualPanicDevice(g.conn)
-        g.add_device(pdev)
-
-        self._compare(g, "boot-many-devices", False)
-
-    def testCpuset(self):
-        normaltest = utils.open_testdefault()
-        utils.set_conn(normaltest)
-        g = utils.get_basic_fullyvirt_guest()
-
-        # Cpuset
-        cpustr = virtinst.DomainNumatune.generate_cpuset(g.conn, g.memory)
-        g.cpuset = cpustr
-        g.vcpus = 7
-
-        g.cpu.model = "footest"
-        g.cpu.vendor = "Intel"
-        g.cpu.match = "minimum"
-
-        g.cpu.threads = "2"
-        g.cpu.sockets = "4"
-        g.cpu.cores = "5"
-
-        g.cpu.add_feature("x2apic", "force")
-        g.cpu.add_feature("lahf_lm", "forbid")
-
-        self._compare(g, "boot-cpuset", False)
-
-        # Test CPU topology determining
-        cpu = virtinst.CPU(g.conn)
-        cpu.sockets = "2"
-        cpu.set_topology_defaults(6)
-        self.assertEquals([cpu.sockets, cpu.cores, cpu.threads], [2, 3, 1])
-
-        cpu = virtinst.CPU(g.conn)
-        cpu.cores = "4"
-        cpu.set_topology_defaults(9)
-        self.assertEquals([cpu.sockets, cpu.cores, cpu.threads], [2, 4, 1])
-
-        cpu = virtinst.CPU(g.conn)
-        cpu.threads = "3"
-        cpu.set_topology_defaults(14)
-        self.assertEquals([cpu.sockets, cpu.cores, cpu.threads], [4, 1, 3])
-
-        cpu = virtinst.CPU(g.conn)
-        cpu.sockets = 5
-        cpu.cores = 2
-        self.assertEquals(cpu.vcpus_from_topology(), 10)
-
-        cpu = virtinst.CPU(g.conn)
-        self.assertEquals(cpu.vcpus_from_topology(), 1)
-
-    def testUsb2(self):
-        i = utils.make_pxe_installer()
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-
-        for dev in virtinst.VirtualController.get_usb2_controllers(g.conn):
-            g.add_device(dev)
-
-        self._compare(g, "boot-usb2", False)
-
-
-    def testFullKVMRHEL6(self):
-        utils.set_conn(_plainkvm)
-        i = utils.make_distro_installer(
-            location="tests/cli-test-xml/fakerhel6tree")
-        g = utils.get_basic_fullyvirt_guest("kvm", installer=i)
-        g.add_device(utils.get_floppy())
-        g.add_device(utils.get_filedisk("/dev/default-pool/rhel6.img"))
-        g.add_device(utils.get_blkdisk())
-        g.add_device(utils.get_virtual_network())
-        g.add_device(VirtualAudio(g.conn))
-        g.add_device(VirtualVideoDevice(g.conn))
-
-        self._testInstall(g, "rhel6-kvm-stage1", "rhel6-kvm-stage2",
-            detect_distro=True)
-
-    def testFullKVMWinxp(self):
-        utils.set_conn(_plainkvm)
-        g = utils.build_win_kvm("/dev/default-pool/winxp.img")
-        self._testInstall(g, "winxp-kvm-stage1",
-                          "winxp-kvm-stage3", "winxp-kvm-stage2")
+        utils.diff_compare(actualXML, filename)
+        utils.test_create(guest.conn, actualXML)
 
     def testDefaultBridge(self):
+        # Test our handling of the default bridge routines
         origfunc = None
         util = None
         try:
@@ -969,16 +135,16 @@ class TestXMLConfig(unittest.TestCase):
                 return "bzz0"
             util.default_bridge = newbridge
 
-            dev1 = virtinst.VirtualNetworkInterface(utils.get_conn())
+            dev1 = virtinst.VirtualNetworkInterface(_default_conn)
             dev1.macaddr = "22:22:33:44:55:66"
 
-            dev2 = virtinst.VirtualNetworkInterface(utils.get_conn(),
+            dev2 = virtinst.VirtualNetworkInterface(_default_conn,
                                     parsexml=dev1.get_xml_config())
             dev2.source = None
             dev2.source = "foobr0"
             dev2.macaddr = "22:22:33:44:55:67"
 
-            dev3 = virtinst.VirtualNetworkInterface(utils.get_conn(),
+            dev3 = virtinst.VirtualNetworkInterface(_default_conn,
                                     parsexml=dev1.get_xml_config())
             dev3.source = None
             dev3.macaddr = "22:22:33:44:55:68"
@@ -1002,25 +168,26 @@ class TestXMLConfig(unittest.TestCase):
                 util.default_bridge = origfunc
 
     def testCpustrToTuple(self):
-        conn = utils.get_conn()
+        # Various testing our cpustr handling
+        conn = _default_conn
         base = [False] * 16
 
         expect = base[:]
         expect[1] = expect[2] = expect[3] = True
         self.assertEquals(tuple(expect),
-                    virtinst.DomainNumatune.cpuset_str_to_tuple(conn, "1-3"))
+            virtinst.DomainNumatune.cpuset_str_to_tuple(conn, "1-3"))
 
         expect = base[:]
         expect[1] = expect[3] = expect[5] = expect[10] = expect[11] = True
         self.assertEquals(tuple(expect),
-                    virtinst.DomainNumatune.cpuset_str_to_tuple(conn,
-                                                                "1,3,5,10-11"))
+            virtinst.DomainNumatune.cpuset_str_to_tuple(conn, "1,3,5,10-11"))
 
         self.assertRaises(ValueError,
-                          virtinst.DomainNumatune.cpuset_str_to_tuple,
-                          conn, "16")
+            virtinst.DomainNumatune.cpuset_str_to_tuple,
+            conn, "16")
 
     def testDiskNumbers(self):
+        # Various testing our target generation
         self.assertEquals("a", VirtualDisk.num_to_target(1))
         self.assertEquals("b", VirtualDisk.num_to_target(2))
         self.assertEquals("z", VirtualDisk.num_to_target(26))
@@ -1038,10 +205,12 @@ class TestXMLConfig(unittest.TestCase):
         self.assertEquals(VirtualDisk.target_to_num("vdab"), 27)
         self.assertEquals(VirtualDisk.target_to_num("vdaz"), 51)
         self.assertEquals(VirtualDisk.target_to_num("xvdba"), 52)
-        self.assertEquals(VirtualDisk.target_to_num("xvdzz"), 26 * (25 + 1) + 25)
-        self.assertEquals(VirtualDisk.target_to_num("xvdaaa"), 26 * 26 * 1 + 26 * 1 + 0)
+        self.assertEquals(VirtualDisk.target_to_num("xvdzz"),
+            26 * (25 + 1) + 25)
+        self.assertEquals(VirtualDisk.target_to_num("xvdaaa"),
+            26 * 26 * 1 + 26 * 1 + 0)
 
-        disk = virtinst.VirtualDisk(utils.get_conn())
+        disk = virtinst.VirtualDisk(_default_conn)
         disk.bus = "ide"
 
         self.assertEquals("hda", disk.generate_target([]))
@@ -1050,16 +219,91 @@ class TestXMLConfig(unittest.TestCase):
         self.assertEquals("hdb", disk.generate_target(["hda", "hdd"]))
 
         disk.bus = "virtio-scsi"
-        self.assertEquals("sdb", disk.generate_target(["sda", "sdg", "sdi"], 0))
+        self.assertEquals("sdb",
+            disk.generate_target(["sda", "sdg", "sdi"], 0))
         self.assertEquals("sdh", disk.generate_target(["sda", "sdg"], 1))
 
-    def testFedoraTreeinfo(self):
-        i = utils.make_distro_installer(
-                                location="tests/cli-test-xml/fakefedoratree")
-        g = utils.get_basic_fullyvirt_guest(installer=i)
-        g.type = "kvm"
+    def testQuickTreeinfo(self):
+        # Simple sanity test to make sure detect_distro works. test-urls
+        # does much more exhaustive testing but it's only run occasionally
+        i = _make_installer(
+            location="tests/cli-test-xml/fakefedoratree")
+        g = _make_guest(i)
         v = i.detect_distro(g)
         self.assertEquals(v, "fedora17")
 
-if __name__ == "__main__":
-    unittest.main()
+        i = _make_installer(
+            location="tests/cli-test-xml/fakerhel6tree")
+        g = _make_guest(i)
+        v = i.detect_distro(g)
+        self.assertEquals(v, "rhel6.0")
+
+    def testCPUTopology(self):
+        # Test CPU topology determining
+        cpu = virtinst.CPU(_default_conn)
+        cpu.sockets = "2"
+        cpu.set_topology_defaults(6)
+        self.assertEquals([cpu.sockets, cpu.cores, cpu.threads], [2, 3, 1])
+
+        cpu = virtinst.CPU(_default_conn)
+        cpu.cores = "4"
+        cpu.set_topology_defaults(9)
+        self.assertEquals([cpu.sockets, cpu.cores, cpu.threads], [2, 4, 1])
+
+        cpu = virtinst.CPU(_default_conn)
+        cpu.threads = "3"
+        cpu.set_topology_defaults(14)
+        self.assertEquals([cpu.sockets, cpu.cores, cpu.threads], [4, 1, 3])
+
+        cpu = virtinst.CPU(_default_conn)
+        cpu.sockets = 5
+        cpu.cores = 2
+        self.assertEquals(cpu.vcpus_from_topology(), 10)
+
+        cpu = virtinst.CPU(_default_conn)
+        self.assertEquals(cpu.vcpus_from_topology(), 1)
+
+    def testAC97(self):
+        # Test setting ac97 version given various version combos
+        def has_ac97(conn):
+            g = _make_guest(conn=conn)
+
+            g.os_variant = "fedora11"
+
+            # pylint: disable=unpacking-non-sequence
+            xml, ignore = g.start_install(return_xml=True, dry=True)
+            return "ac97" in xml
+
+        self.assertTrue(has_ac97(utils.open_plainkvm(connver=11000)))
+        self.assertFalse(has_ac97(utils.open_plainkvm(libver=5000)))
+        self.assertFalse(has_ac97(
+            utils.open_plainkvm(libver=7000, connver=7000)))
+
+    def testOSDeviceDefaultChange(self):
+        """
+        Make sure device defaults are properly changed if we change OS
+        distro/variant mid process
+        """
+        conn = utils.open_plainkvm(connver=12005)
+        g = _make_guest(conn=conn)
+        do_install = False
+
+        # Call get_xml_config sets first round of defaults w/o os_variant set
+        g.get_install_xml(do_install)
+
+        g.os_variant = "fedora11"
+        self._compare(g, "install-f11-norheldefaults", do_install)
+
+        try:
+            virtinst.stable_defaults = True
+            origemu = g.emulator
+            g.emulator = "/usr/libexec/qemu-kvm"
+            setattr(g.conn, "_support_cache", {})
+            self._compare(g, "install-f11-rheldefaults", do_install)
+            g.emulator = origemu
+            setattr(g.conn, "_support_cache", {})
+        finally:
+            virtinst.stable_defaults = False
+
+        # Verify main guest wasn't polluted
+        self._compare(g, "install-f11-norheldefaults", do_install)
diff --git a/virtinst/distroinstaller.py b/virtinst/distroinstaller.py
index 2a6816d5a..24989e66b 100644
--- a/virtinst/distroinstaller.py
+++ b/virtinst/distroinstaller.py
@@ -430,10 +430,6 @@ class DistroInstaller(Installer):
     def _prepare(self, guest, meter):
         mediatype = self._get_media_type()
 
-        # Test suite manually injected a boot kernel
-        if self._install_kernel and not self.scratchdir_required():
-            return
-
         if mediatype == MEDIA_CDROM_IMPLIED:
             return
 
@@ -471,9 +467,6 @@ class DistroInstaller(Installer):
         return not self.livecd
 
     def scratchdir_required(self):
-        if not self.location:
-            return False
-
         mediatype = self._get_media_type()
         return mediatype in [MEDIA_CDROM_URL, MEDIA_LOCATION_URL,
                              MEDIA_LOCATION_DIR, MEDIA_LOCATION_CDROM]