From d0924f8c808013da1da01b214dcac681538c1163 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 3 Jul 2019 08:36:09 +0200
Subject: [PATCH] tests: Drop sexpr2xmltest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now that we no longer support sexpr conversion to the internal config we
can drop the test.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 tests/Makefile.am                             |  10 +-
 tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr |   6 -
 tests/sexpr2xmldata/sexpr2xml-boot-grub.xml   |  30 ----
 .../sexpr2xml-bridge-ipaddr.sexpr             |  10 --
 .../sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml |  38 ----
 tests/sexpr2xmldata/sexpr2xml-curmem.sexpr    |  50 ------
 tests/sexpr2xmldata/sexpr2xml-curmem.xml      |  44 -----
 .../sexpr2xml-disk-block-shareable.sexpr      |   6 -
 .../sexpr2xml-disk-block-shareable.xml        |  36 ----
 .../sexpr2xmldata/sexpr2xml-disk-block.sexpr  |   8 -
 tests/sexpr2xmldata/sexpr2xml-disk-block.xml  |  31 ----
 .../sexpr2xml-disk-drv-blktap-qcow.sexpr      |   8 -
 .../sexpr2xml-disk-drv-blktap-qcow.xml        |  31 ----
 .../sexpr2xml-disk-drv-blktap-raw.sexpr       |   8 -
 .../sexpr2xml-disk-drv-blktap-raw.xml         |  31 ----
 .../sexpr2xml-disk-drv-blktap2-raw.sexpr      |   8 -
 .../sexpr2xml-disk-drv-blktap2-raw.xml        |  31 ----
 tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr |   8 -
 tests/sexpr2xmldata/sexpr2xml-disk-file.xml   |  31 ----
 .../sexpr2xmldata/sexpr2xml-fv-autoport.sexpr |  86 ---------
 tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml |  59 ------
 .../sexpr2xml-fv-empty-kernel.sexpr           |  11 --
 .../sexpr2xml-fv-empty-kernel.xml             |  52 ------
 .../sexpr2xml-fv-force-hpet.sexpr             |  11 --
 .../sexpr2xmldata/sexpr2xml-fv-force-hpet.xml |  55 ------
 .../sexpr2xml-fv-force-nohpet.sexpr           |  11 --
 .../sexpr2xml-fv-force-nohpet.xml             |  55 ------
 tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr |   9 -
 tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml   |  36 ----
 .../sexpr2xml-fv-legacy-vfb.sexpr             |  70 --------
 .../sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml |  37 ----
 .../sexpr2xml-fv-localtime.sexpr              |  10 --
 .../sexpr2xmldata/sexpr2xml-fv-localtime.xml  |  52 ------
 .../sexpr2xml-fv-net-netfront.sexpr           |  11 --
 .../sexpr2xml-fv-net-netfront.xml             |  53 ------
 .../sexpr2xml-fv-parallel-tcp.sexpr           |  10 --
 .../sexpr2xml-fv-parallel-tcp.xml             |  57 ------
 .../sexpr2xml-fv-serial-dev-2-ports.sexpr     |  12 --
 .../sexpr2xml-fv-serial-dev-2-ports.xml       |  64 -------
 .../sexpr2xml-fv-serial-dev-2nd-port.sexpr    |  11 --
 .../sexpr2xml-fv-serial-dev-2nd-port.xml      |  60 -------
 .../sexpr2xml-fv-serial-file.sexpr            |  12 --
 .../sexpr2xml-fv-serial-file.xml              |  60 -------
 .../sexpr2xml-fv-serial-null.sexpr            |  10 --
 .../sexpr2xml-fv-serial-null.xml              |  58 ------
 .../sexpr2xml-fv-serial-pipe.sexpr            |  12 --
 .../sexpr2xml-fv-serial-pipe.xml              |  60 -------
 .../sexpr2xml-fv-serial-pty.sexpr             |  11 --
 .../sexpr2xmldata/sexpr2xml-fv-serial-pty.xml |  58 ------
 .../sexpr2xml-fv-serial-stdio.sexpr           |  10 --
 .../sexpr2xml-fv-serial-stdio.xml             |  58 ------
 .../sexpr2xml-fv-serial-tcp-telnet.sexpr      |  11 --
 .../sexpr2xml-fv-serial-tcp-telnet.xml        |  62 -------
 .../sexpr2xml-fv-serial-tcp.sexpr             |  11 --
 .../sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml |  62 -------
 .../sexpr2xml-fv-serial-udp.sexpr             |  11 --
 .../sexpr2xmldata/sexpr2xml-fv-serial-udp.xml |  62 -------
 .../sexpr2xml-fv-serial-unix.sexpr            |  11 --
 .../sexpr2xml-fv-serial-unix.xml              |  60 -------
 .../sexpr2xml-fv-sound-all.sexpr              |  11 --
 .../sexpr2xmldata/sexpr2xml-fv-sound-all.xml  |  54 ------
 tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr  |  10 --
 tests/sexpr2xmldata/sexpr2xml-fv-sound.xml    |  54 ------
 .../sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr |  10 --
 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml |  53 ------
 .../sexpr2xml-fv-usbtablet.sexpr              |  10 --
 .../sexpr2xmldata/sexpr2xml-fv-usbtablet.xml  |  53 ------
 tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr    |  11 --
 tests/sexpr2xmldata/sexpr2xml-fv-utc.xml      |  52 ------
 tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr     |   9 -
 tests/sexpr2xmldata/sexpr2xml-fv-v2.xml       |  52 ------
 tests/sexpr2xmldata/sexpr2xml-fv.sexpr        |  11 --
 tests/sexpr2xmldata/sexpr2xml-fv.xml          |  52 ------
 .../sexpr2xmldata/sexpr2xml-net-bridged.sexpr |   9 -
 tests/sexpr2xmldata/sexpr2xml-net-bridged.xml |  37 ----
 tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr |  10 --
 tests/sexpr2xmldata/sexpr2xml-net-e1000.xml   |  38 ----
 .../sexpr2xmldata/sexpr2xml-net-routed.sexpr  |  10 --
 tests/sexpr2xmldata/sexpr2xml-net-routed.xml  |  37 ----
 .../sexpr2xml-no-source-cdrom.sexpr           |  66 -------
 .../sexpr2xml-no-source-cdrom.xml             |  58 ------
 tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr  |  10 --
 tests/sexpr2xmldata/sexpr2xml-pci-devs.xml    |  43 -----
 .../sexpr2xml-pv-bootloader-cmdline.sexpr     |   5 -
 .../sexpr2xml-pv-bootloader-cmdline.xml       |  31 ----
 .../sexpr2xml-pv-bootloader.sexpr             |   5 -
 .../sexpr2xmldata/sexpr2xml-pv-bootloader.xml |  30 ----
 .../sexpr2xml-pv-localtime.sexpr              |   8 -
 .../sexpr2xmldata/sexpr2xml-pv-localtime.xml  |  31 ----
 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr  |   8 -
 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml    |  31 ----
 .../sexpr2xml-pv-vfb-new-vncdisplay.sexpr     |  10 --
 .../sexpr2xml-pv-vfb-new-vncdisplay.xml       |  37 ----
 .../sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr  |   9 -
 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml  |  37 ----
 .../sexpr2xml-pv-vfb-type-crash.sexpr         |  83 ---------
 .../sexpr2xml-pv-vfb-type-crash.xml           |  42 -----
 tests/sexpr2xmldata/sexpr2xml-pv.sexpr        |   8 -
 tests/sexpr2xmldata/sexpr2xml-pv.xml          |  31 ----
 tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr  |  11 --
 tests/sexpr2xmldata/sexpr2xml-vif-rate.xml    |  56 ------
 tests/sexpr2xmltest.c                         | 170 ------------------
 tests/virschematest.c                         |   2 +-
 103 files changed, 3 insertions(+), 3298 deletions(-)
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-curmem.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-curmem.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-file.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-routed.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv.xml
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
 delete mode 100644 tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
 delete mode 100644 tests/sexpr2xmltest.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 90bf94fe08..107f2de859 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -125,7 +125,6 @@ EXTRA_DIST = \
 	secretxml2xmlin \
 	securityselinuxhelperdata \
 	securityselinuxlabeldata \
-	sexpr2xmldata \
 	storagepoolcapsschemadata \
 	storagepoolschemadata \
 	storagepoolxml2xmlin \
@@ -267,7 +266,7 @@ endif WITH_SECDRIVER_SELINUX
 ssh_SOURCES = ssh.c
 
 if WITH_LIBXL
-test_programs += xlconfigtest sexpr2xmltest \
+test_programs += xlconfigtest \
 	xmconfigtest libxlxml2domconfigtest
 test_libraries += libxltestdriver.la libxlmock.la
 endif WITH_LIBXL
@@ -503,11 +502,6 @@ xlconfigtest_SOURCES = \
 	testutils.c testutils.h
 xlconfigtest_LDADD =$(libxl_LDADDS)
 
-sexpr2xmltest_SOURCES = \
-	sexpr2xmltest.c testutilsxen.c testutilsxen.h \
-	testutils.c testutils.h
-sexpr2xmltest_LDADD = $(libxl_LDADDS)
-
 xmconfigtest_SOURCES = \
 	xmconfigtest.c testutilsxen.c testutilsxen.h \
 	testutils.c testutils.h
@@ -525,7 +519,7 @@ libxlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
 libxlmock_la_LIBADD = $(MOCKLIBS_LIBS)
 
 else ! WITH_LIBXL
-EXTRA_DIST += xlconfigtest.c sexpr2xmltest.c \
+EXTRA_DIST += xlconfigtest.c \
 	xmconfigtest.c libxlxml2domconfigtest.c
 endif ! WITH_LIBXL
 
diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr b/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr
deleted file mode 100644
index c8c0cb1ef3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr
+++ /dev/null
@@ -1,6 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')\
-(args '(hd0,0)/grub/menu.lst')))(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestVG')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
deleted file mode 100644
index 0889c68ed0..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/usr/lib/xen/boot/pv-grub-x86_64.gz</kernel>
-    <cmdline>(hd0,0)/grub/menu.lst</cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='block' device='disk'>
-      <driver name='phy' type='raw'/>
-      <source dev='/dev/MainVG/GuestVG'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
deleted file mode 100644
index cb9e3f8bf9..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
-(script 'vif-bridge')(ip '192.0.2.1')))
diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
deleted file mode 100644
index 9c83847afe..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:11:22:33:44:55'/>
-      <source bridge='xenbr2'/>
-      <ip address='192.0.2.1' family='ipv4'/>
-      <script path='vif-bridge'/>
-      <target dev='vif6.0'/>
-    </interface>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.sexpr b/tests/sexpr2xmldata/sexpr2xml-curmem.sexpr
deleted file mode 100644
index 486ebf3295..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.sexpr
+++ /dev/null
@@ -1,50 +0,0 @@
-(domain
-    (domid 5)
-    (uuid 4f77abd2-3019-58e8-3bab-6fbf2118f880)
-    (vcpus 1)
-    (cpu_weight 1.0)
-    (memory 175)
-    (shadow_memory 0)
-    (maxmem 385)
-    (bootloader /usr/bin/pygrub)
-    (features )
-    (name rhel5)
-    (on_poweroff destroy)
-    (on_reboot restart)
-    (on_crash restart)
-    (image
-        (linux
-            (ramdisk /var/lib/xen/initrd.gULTf1)
-            (kernel /var/lib/xen/vmlinuz.blj7cs)
-            (args 'ro root=/dev/VolGroup00/LogVol00 rhgb quiet')
-            (vncunused 1)
-            (vnc 1)
-            (display localhost:10.0)
-            (xauthority /root/.Xauthority)
-        )
-    )
-    (device
-        (vif
-            (backend 0)
-            (script vif-bridge)
-            (bridge xenbr0)
-            (mac 00:16:3e:1d:06:15)
-        )
-    )
-    (device
-        (tap
-            (backend 0)
-            (dev xvda:disk)
-            (uname tap:aio:/xen/rhel5.img)
-            (mode w)
-        )
-    )
-    (state -b----)
-    (shutdown_reason poweroff)
-    (cpu_time 137.189121425)
-    (online_vcpus 1)
-    (up_time 66492.0194759)
-    (start_time 1163083021.65)
-    (store_mfn 74407)
-    (console_mfn 198038)
-)
diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
deleted file mode 100644
index e091829444..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<domain type='xen' id='5'>
-  <name>rhel5</name>
-  <uuid>4f77abd2-3019-58e8-3bab-6fbf2118f880</uuid>
-  <memory unit='KiB'>394240</memory>
-  <currentMemory unit='KiB'>179200</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.blj7cs</kernel>
-    <initrd>/var/lib/xen/initrd.gULTf1</initrd>
-    <cmdline>ro root=/dev/VolGroup00/LogVol00 rhgb quiet</cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <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='raw'/>
-      <source file='/xen/rhel5.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1d:06:15'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif5.0'/>
-    </interface>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='xen' vram='4096' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr
deleted file mode 100644
index 80d41672bf..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr
+++ /dev/null
@@ -1,6 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)\
-(uuid '49a0c6ffc066539264983632d093c2e7')(bootloader '/usr/bin/pygrub')\
-(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
-(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\
-(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\
-(script 'vif-bridge'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
deleted file mode 100644
index 800b583192..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>49a0c6ff-c066-5392-6498-3632d093c2e7</uuid>
-  <memory unit='KiB'>524288</memory>
-  <currentMemory unit='KiB'>393216</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <os>
-    <type>linux</type>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <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='raw'/>
-      <source file='/var/lib/xen/images/rhel5pv.img'/>
-      <target dev='xvda' bus='xen'/>
-      <shareable/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:23:9e:eb'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif6.0'/>
-    </interface>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr
deleted file mode 100644
index 3f64ba6fdd..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestVG')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
deleted file mode 100644
index e8a236e3d1..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='block' device='disk'>
-      <driver name='phy' type='raw'/>
-      <source dev='/dev/MainVG/GuestVG'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr
deleted file mode 100644
index b96fa61cf2..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (tap (dev 'xvda')\
-(uname 'tap:qcow:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
deleted file mode 100644
index 57bb88cd2b..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <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='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr
deleted file mode 100644
index ef7cb4b685..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (tap (dev 'xvda')\
-(uname 'tap:aio:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
deleted file mode 100644
index c390053e82..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <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='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr
deleted file mode 100644
index a72a73334c..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (tap2 (dev 'xvda')\
-(uname 'tap2:aio:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
deleted file mode 100644
index 3a44af0760..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='tap2' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr
deleted file mode 100644
index d582ea0cb5..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
deleted file mode 100644
index 9aae240832..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
deleted file mode 100644
index cdbbaedeef..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
+++ /dev/null
@@ -1,86 +0,0 @@
-(domain
-    (domid 21)
-    (on_crash destroy)
-    (uuid e0c172e6-4ad8-7353-0ece-515d2f181365)
-    (bootloader_args )
-    (vcpus 1)
-    (name domu-224)
-    (on_poweroff destroy)
-    (on_reboot destroy)
-    (bootloader )
-    (maxmem 512)
-    (memory 512)
-    (shadow_memory 5)
-    (cpu_weight 256)
-    (cpu_cap 0)
-    (features )
-    (on_xend_start ignore)
-    (on_xend_stop shutdown)
-    (start_time 1233108538.42)
-    (cpu_time 907.159661051)
-    (online_vcpus 1)
-    (image
-        (hvm
-            (kernel /usr/lib/xen/boot/hvmloader)
-            (boot d)
-            (device_model /usr/lib/xen/bin/qemu-system-i386)
-            (keymap en-us)
-            (localtime 1)
-            (pae 1)
-            (serial pty)
-            (usb 1)
-            (usbdevice tablet)
-            (notes (SUSPEND_CANCEL 1))
-        )
-    )
-    (status 2)
-    (state r-----)
-    (store_mfn 131070)
-    (device
-        (vif
-            (bridge e1000g0)
-            (mac 00:16:3e:1b:e8:18)
-            (script vif-vnic)
-            (uuid 7da8c614-018b-dc87-6bfc-a296a95bca4f)
-            (backend 0)
-        )
-    )
-    (device
-        (vbd
-            (uname phy:/iscsi/winxp)
-            (uuid 65e19258-f4a2-a9ff-3b31-469ceaf4ec8d)
-            (mode w)
-            (dev hda:disk)
-            (backend 0)
-            (bootable 1)
-        )
-    )
-    (device
-        (vbd
-            (uname file:/net/heaped/export/netimage/windows/xp-sp2-vol.iso)
-            (uuid 87d9383b-f0ad-11a4-d668-b965f55edc3f)
-            (mode r)
-            (dev hdc:cdrom)
-            (backend 0)
-            (bootable 0)
-        )
-    )
-    (device (vkbd (backend 0)))
-    (device
-        (vfb
-            (vncdisplay 25)
-            (vncunused 1)
-            (keymap en-us)
-            (type vnc)
-            (uuid 09666ad1-0c94-d79c-1439-99e05394ee51)
-            (location localhost:5925)
-        )
-    )
-    (device
-        (console
-            (protocol vt100)
-            (location 3)
-            (uuid cabfc0f5-1c9c-0e6f-aaa8-9974262aff66)
-        )
-    )
-)
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
deleted file mode 100644
index 20d60602d3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<domain type='xen' id='21'>
-  <name>domu-224</name>
-  <uuid>e0c172e6-4ad8-7353-0ece-515d2f181365</uuid>
-  <memory unit='KiB'>524288</memory>
-  <currentMemory unit='KiB'>524288</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='cdrom'/>
-  </os>
-  <features>
-    <pae/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='localtime'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='block' device='disk'>
-      <driver name='phy' type='raw'/>
-      <source dev='/iscsi/winxp'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/net/heaped/export/netimage/windows/xp-sp2-vol.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:e8:18'/>
-      <source bridge='e1000g0'/>
-      <script path='vif-vnic'/>
-      <target dev='vif21.0'/>
-    </interface>
-    <serial type='pty'>
-      <target port='0'/>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='tablet' bus='usb'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5925' autoport='yes' keymap='en-us'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
deleted file mode 100644
index 1372025df3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (loader /usr/lib/xen/boot/hvmloader)(kernel '')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot d)(cdrom '/root/boot.iso')\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
deleted file mode 100644
index 7cc4381885..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='cdrom'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
deleted file mode 100644
index 8f31abf187..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(hpet 1)(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000')(type ioemu))))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
deleted file mode 100644
index 831417107d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'>
-    <timer name='hpet' 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-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-      <model type='e1000'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
deleted file mode 100644
index 7fee66693e..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(hpet 0)(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000')(type ioemu))))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
deleted file mode 100644
index f1af499d07..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'>
-    <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-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-      <model type='e1000'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr
deleted file mode 100644
index 25231adb6a..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(domain (domid 15)(name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\
-(usb 1)(serial pty)))(device (vbd (dev 'ioemu:xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
deleted file mode 100644
index 95fab2f9c1..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='xen' id='15'>
-  <name>fvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-    <boot dev='hd'/>
-  </os>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <serial type='pty'>
-      <target port='0'/>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
deleted file mode 100644
index 8bc6cfacfe..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
+++ /dev/null
@@ -1,70 +0,0 @@
-(domain
-    (domid 1)
-    (on_crash restart)
-    (uuid fde0533d-d043-88c6-dfba-4822fa32f309)
-    (bootloader_args )
-    (vcpus 1)
-    (name s10u4)
-    (on_poweroff destroy)
-    (on_reboot restart)
-    (bootloader )
-    (maxmem 1024)
-    (memory 1024)
-    (shadow_memory 9)
-    (cpu_weight 256)
-    (cpu_cap 0)
-    (features )
-    (on_xend_start ignore)
-    (on_xend_stop shutdown)
-    (start_time 1201894394.0)
-    (cpu_time 17.253230349)
-    (online_vcpus 1)
-    (image
-        (hvm
-            (kernel /usr/lib/xen/boot/hvmloader)
-            (boot c)
-            (device_model /usr/lib/xen/bin/qemu-system-i386)
-            (keymap en-us)
-            (localtime 0)
-            (pae 1)
-            (vnc 1)
-            (vncunused 1)
-            (notes (SUSPEND_CANCEL 1))
-        )
-    )
-    (status 2)
-    (state -b----)
-    (store_mfn 262142)
-    (device
-        (vif
-            (mac 00:16:3e:3b:b9:d7)
-            (script vif-vnic)
-            (uuid 33b87cce-c187-4bdd-8301-6411a48be129)
-            (backend 0)
-        )
-    )
-    (device
-        (vbd
-            (uname phy:/dev/zvol/dsk/export/s10u4-root)
-            (uuid b1d5196f-aae7-74bb-43dc-b4aae943b9bd)
-            (mode w)
-            (dev hda:disk)
-            (backend 0)
-            (bootable 1)
-        )
-    )
-    (device
-        (vfb
-            (vncunused 1)
-            (uuid d45dfd90-c0e0-8851-8f14-f16ba9512d2d)
-            (location localhost:5900)
-        )
-    )
-    (device
-        (console
-            (protocol vt100)
-            (location 3)
-            (uuid 0248d3f7-f3ae-78e8-4829-ad51a6f94efd)
-        )
-    )
-)
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
deleted file mode 100644
index 659dcfd8a7..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='1'>
-  <name>s10u4</name>
-  <uuid>fde0533d-d043-88c6-dfba-4822fa32f309</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <pae/>
-  </features>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <interface type='ethernet'>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:3b:b9:d7'/>
-      <script path='vif-vnic'/>
-    </interface>
-    <disk type='block' device='disk'>
-      <driver name='phy'/>
-      <source dev='/dev/zvol/dsk/export/s10u4-root'/>
-      <backingStore/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='-1' keymap='en-us'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
deleted file mode 100644
index 6673aef55d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)(localtime 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
deleted file mode 100644
index d4bc171aed..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='localtime'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
deleted file mode 100644
index 3516e72a04..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type 'netfront'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
deleted file mode 100644
index 058299af7c..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-      <model type='netfront'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
deleted file mode 100644
index 6628452915..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel tcp:localhost:9999)\
-(serial none)(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
deleted file mode 100644
index 9af01d072c..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <parallel type='tcp'>
-      <source mode='connect' host='localhost' service='9999'/>
-      <protocol type='raw'/>
-      <target port='0'/>
-    </parallel>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
deleted file mode 100644
index a8d08340ac..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
-(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib/xen/bin/qemu-system-i386')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
-(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
deleted file mode 100644
index e352250696..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8ff</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='dev'>
-      <source path='/dev/ttyS0'/>
-      <target port='0'/>
-    </serial>
-    <serial type='dev'>
-      <source path='/dev/ttyS1'/>
-      <target port='1'/>
-    </serial>
-    <console type='dev'>
-      <source path='/dev/ttyS0'/>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
deleted file mode 100644
index d9e7336aed..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial (none /dev/ttyS1))(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
deleted file mode 100644
index 51d2a7c2d7..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8ff</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='dev'>
-      <source path='/dev/ttyS1'/>
-      <target port='1'/>
-    </serial>
-    <console type='dev'>
-      <source path='/dev/ttyS1'/>
-      <target type='serial' port='1'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
deleted file mode 100644
index b52a5e4553..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial file:/tmp/serial.log)(device_model '/usr/lib/xen/bin/qemu-system-i386')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
-(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
deleted file mode 100644
index cce3a9e0b4..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='file'>
-      <source path='/tmp/serial.log'/>
-      <target port='0'/>
-    </serial>
-    <console type='file'>
-      <source path='/tmp/serial.log'/>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
deleted file mode 100644
index caf8b4a87c..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial null)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
deleted file mode 100644
index d68bfa89ae..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='null'>
-      <target port='0'/>
-    </serial>
-    <console type='null'>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
deleted file mode 100644
index be3e13cd76..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib/xen/bin/qemu-system-i386')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
-(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
deleted file mode 100644
index 5ab4048d29..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='pipe'>
-      <source path='/tmp/serial.pipe'/>
-      <target port='0'/>
-    </serial>
-    <console type='pipe'>
-      <source path='/tmp/serial.pipe'/>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
deleted file mode 100644
index 3ac68630c4..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial pty)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
deleted file mode 100644
index 89d371dc36..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='pty'>
-      <target port='0'/>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
deleted file mode 100644
index e3eb554eaf..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial stdio)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
deleted file mode 100644
index 9482ceccb2..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='stdio'>
-      <target port='0'/>
-    </serial>
-    <console type='stdio'>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
deleted file mode 100644
index 8107efebbd..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial telnet:localhost:9999,server,nowait)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
deleted file mode 100644
index ae7a4c54e0..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='tcp'>
-      <source mode='bind' host='localhost' service='9999'/>
-      <protocol type='telnet'/>
-      <target port='0'/>
-    </serial>
-    <console type='tcp'>
-      <source mode='bind' host='localhost' service='9999'/>
-      <protocol type='telnet'/>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
deleted file mode 100644
index 32cb2ba071..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial tcp:localhost:9999,server,nowait)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
deleted file mode 100644
index 20cbdb6815..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='tcp'>
-      <source mode='bind' host='localhost' service='9999'/>
-      <protocol type='raw'/>
-      <target port='0'/>
-    </serial>
-    <console type='tcp'>
-      <source mode='bind' host='localhost' service='9999'/>
-      <protocol type='raw'/>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
deleted file mode 100644
index 3eea329959..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial udp:localhost:9998@localhost:9999)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
deleted file mode 100644
index ece6a2684e..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='udp'>
-      <source mode='bind' host='localhost' service='9999'/>
-      <source mode='connect' host='localhost' service='9998'/>
-      <target port='0'/>
-    </serial>
-    <console type='udp'>
-      <source mode='bind' host='localhost' service='9999'/>
-      <source mode='connect' host='localhost' service='9998'/>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
deleted file mode 100644
index aff06a67fc..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial unix:/tmp/serial.sock,server,nowait)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
deleted file mode 100644
index 2740e99d70..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<domain type='xen' id='1'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <serial type='unix'>
-      <source mode='bind' path='/tmp/serial.sock'/>
-      <target port='0'/>
-    </serial>
-    <console type='unix'>
-      <source mode='bind' path='/tmp/serial.sock'/>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
deleted file mode 100644
index 6b0e822366..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(device (vbd (dev 'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
deleted file mode 100644
index d6f0bf0e67..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <sound model='sb16'/>
-    <sound model='es1370'/>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
deleted file mode 100644
index 9552b9b727..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
deleted file mode 100644
index d6f0bf0e67..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <sound model='sb16'/>
-    <sound model='es1370'/>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
deleted file mode 100644
index 7a10c496b3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
deleted file mode 100644
index f32754b88c..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-    </interface>
-    <input type='mouse' bus='usb'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
deleted file mode 100644
index 3a2eec794a..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
deleted file mode 100644
index f16804d9ba..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-    </interface>
-    <input type='tablet' bus='usb'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
deleted file mode 100644
index 09b7ecd8f6..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)(cdrom '/root/boot.iso')\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
deleted file mode 100644
index 0ef29a6f5d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
deleted file mode 100644
index 135b374c28..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)(acpi 1)(vnc 1)\
-(keymap ja)))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\
-(mode 'w')))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')\
-(mode 'r')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
deleted file mode 100644
index 0ef29a6f5d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
deleted file mode 100644
index 46794a5a13..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
deleted file mode 100644
index 0ef29a6f5d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr b/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr
deleted file mode 100644
index 70a57c42d2..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
deleted file mode 100644
index 2c07e15859..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:11:22:33:44:55'/>
-      <source bridge='xenbr2'/>
-      <script path='vif-bridge'/>
-      <target dev='vif6.0'/>
-    </interface>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr b/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr
deleted file mode 100644
index a5603801a0..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
-(script 'vif-bridge')(model 'e1000'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
deleted file mode 100644
index 3f79e86444..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:11:22:33:44:55'/>
-      <source bridge='xenbr2'/>
-      <script path='vif-bridge'/>
-      <target dev='vif6.0'/>
-      <model type='e1000'/>
-    </interface>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr b/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr
deleted file mode 100644
index d0e4cd5f5d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(dev 'eth3')(script 'vif-routed')\
-(ip '172.14.5.6')))
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
deleted file mode 100644
index a2975fb31d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <interface type='ethernet'>
-      <mac address='00:11:22:33:44:55'/>
-      <ip address='172.14.5.6' family='ipv4'/>
-      <script path='vif-routed'/>
-      <target dev='vif6.0'/>
-    </interface>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
deleted file mode 100644
index bd75f61900..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
+++ /dev/null
@@ -1,66 +0,0 @@
-(domain
-    (domid 6)
-    (on_crash destroy)
-    (memory 350)
-    (uuid cc2315e7-d26a-307a-438c-6d188ec4c09c)
-    (bootloader_args )
-    (name test)
-    (maxmem 382)
-    (on_reboot destroy)
-    (on_poweroff destroy)
-    (localtime 0)
-    (vcpus 1)
-    (bootloader )
-    (shadow_memory 4)
-    (cpu_weight 256)
-    (cpu_cap 0)
-    (features )
-    (on_xend_start ignore)
-    (on_xend_stop ignore)
-    (start_time 1175165307.38)
-    (cpu_time 0.956663338)
-    (online_vcpus 1)
-    (image
-        (hvm
-            (kernel /usr/lib/xen/boot/hvmloader)
-            (vnc 1)
-            (vncunused 1)
-            (device_model /usr/lib/xen/bin/qemu-system-i386)
-            (pae 1)
-            (apic 1)
-            (acpi 1)
-            (boot c)
-            (serial pty)
-            (vcpus 1)
-        )
-    )
-    (status 0)
-    (memory_dynamic_min 358)
-    (memory_dynamic_max 382)
-    (store_mfn 89598)
-    (device
-        (vif
-            (bridge xenbr0)
-            (mac 00:16:3e:0a:7b:39)
-            (type ioemu)
-            (uuid 127fee09-a0c8-c79b-4ee5-6c194efff73a)
-        )
-    )
-    (device
-        (vbd
-            (uname phy:/dev/sda8)
-            (driver paravirtualised)
-            (mode w)
-            (dev hda:disk)
-            (uuid df6969ad-d312-deb1-8d36-223d71e4ce95)
-        )
-    )
-    (device
-        (vbd
-            (driver paravirtualised)
-            (mode r)
-            (dev hdc:cdrom)
-            (uuid fca3aa85-1d1f-2c31-2f0b-f2dff2311f7e)
-        )
-    )
-)
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
deleted file mode 100644
index ae61449a90..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<domain type='xen' id='6'>
-  <name>test</name>
-  <uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid>
-  <memory unit='KiB'>391168</memory>
-  <currentMemory unit='KiB'>358400</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='block' device='disk'>
-      <driver name='phy' type='raw'/>
-      <source dev='/dev/sda8'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver type='raw'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:0a:7b:39'/>
-      <source bridge='xenbr0'/>
-      <target dev='vif6.0'/>
-    </interface>
-    <serial type='pty'>
-      <target port='0'/>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr b/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr
deleted file mode 100644
index 29f4665918..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (pci (backend 0)(dev (domain 0x0001)\
- (bus 0x0c) (slot 0x1b) (func 0x2))(dev (domain 0x0000) (bus 0x01) (slot 0x13)\
- (func 0x0))))(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestVG')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
deleted file mode 100644
index 4606b6ccbd..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='block' device='disk'>
-      <driver name='phy' type='raw'/>
-      <source dev='/dev/MainVG/GuestVG'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='xen'/>
-      <source>
-        <address domain='0x0001' bus='0x0c' slot='0x1b' function='0x2'/>
-      </source>
-    </hostdev>
-    <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='xen'/>
-      <source>
-        <address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/>
-      </source>
-    </hostdev>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr
deleted file mode 100644
index 67c9a6008b..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr
+++ /dev/null
@@ -1,5 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(bootloader '/usr/bin/pygrub')\
-(bootloader_args '-q')(image (linux (args 'xenfb.video=8,1280,1024')))\
-(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')\
-(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
deleted file mode 100644
index 5b8bedd788..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <bootloader_args>-q</bootloader_args>
-  <os>
-    <type>linux</type>
-    <cmdline>xenfb.video=8,1280,1024</cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr
deleted file mode 100644
index 71615579e1..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr
+++ /dev/null
@@ -1,5 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\
-(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
deleted file mode 100644
index cb4b051e35..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <bootloader>/usr/bin/pypxeboot</bootloader>
-  <bootloader_args>mac=AA:00:86:e2:35:72</bootloader_args>
-  <os>
-    <type>linux</type>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr
deleted file mode 100644
index e80259c2b3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')(localtime 1)\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
deleted file mode 100644
index ce057d9538..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='localtime' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
deleted file mode 100644
index 200b8ca4d8..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 4)\
-(vcpu_avail 3)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
deleted file mode 100644
index 6d498325e3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static' current='2'>4</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr
deleted file mode 100644
index 0a2c45c3ea..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))(device (vfb (type vnc)\
-(vncunused 0)(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja)\
-(vncdisplay 25)))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
deleted file mode 100644
index 64e1423f78..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <graphics type='vnc' port='5925' autoport='no' listen='0.0.0.0' keymap='ja'>
-      <listen type='address' address='0.0.0.0'/>
-    </graphics>
-    <video>
-      <model type='xen' vram='4096' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr
deleted file mode 100644
index 3fdc8a5356..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))(device (vfb (type vnc)(vncunused 1)\
-(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja)))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
deleted file mode 100644
index ccd6824af3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'>
-      <listen type='address' address='0.0.0.0'/>
-    </graphics>
-    <video>
-      <model type='xen' vram='4096' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
deleted file mode 100644
index b6511a96f3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
+++ /dev/null
@@ -1,83 +0,0 @@
-(domain
-    (domid 1)
-    (bootloader /usr/bin/pygrub)
-    (on_crash restart)
-    (uuid a36f6e38-f498-b06c-5fad-b04947392dbe)
-    (bootloader_args )
-    (vcpus 1)
-    (name test2vm)
-    (cpus (()))
-    (on_reboot restart)
-    (on_poweroff destroy)
-    (maxmem 512)
-    (memory 512)
-    (shadow_memory 0)
-    (features )
-    (on_xend_start ignore)
-    (on_xend_stop ignore)
-    (start_time 1250626179.35)
-    (cpu_time 21.397345341)
-    (online_vcpus 1)
-    (image
-        (linux
-            (kernel )
-            (device_model /usr/lib/xen/bin/qemu-system-i386)
-            (notes
-                (FEATURES
-'writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel'
-                )
-                (VIRT_BASE 3221225472)
-                (GUEST_VERSION 2.6)
-                (PADDR_OFFSET 3221225472)
-                (GUEST_OS linux)
-                (HYPERCALL_PAGE 3225423872)
-                (LOADER generic)
-                (PAE_MODE yes)
-                (ENTRY 3225419776)
-                (XEN_VERSION xen-3.0)
-            )
-        )
-    )
-    (status 2)
-    (state -b----)
-    (store_mfn 262434)
-    (console_mfn 262433)
-    (device
-        (vif
-            (bridge virbr0)
-            (mac 00:16:36:68:9f:5d)
-            (script /etc/xen/scripts/vif-bridge)
-            (uuid 6435a5d4-9b8e-1e82-6863-5a6b57a4438d)
-            (backend 0)
-        )
-    )
-    (device (vkbd (backend 0)))
-    (device
-        (console
-            (protocol vt100)
-            (location 2)
-            (uuid 2e2c3247-5de1-7bd7-250a-41ab80030e72)
-        )
-    )
-    (device
-        (vbd
-            (protocol x86_32-abi)
-            (uuid 8f888aa8-a1c2-0c2b-0c70-4c3b96abe8c8)
-            (bootable 1)
-            (dev xvda:disk)
-            (uname phy:/dev/vg_dom0test/test2vm)
-            (mode w)
-            (backend 0)
-            (bootable 1)
-            (VDI )
-        )
-    )
-    (device
-        (vfb
-            (vncunused 1)
-            (vnc 1)
-            (uuid 5f61a036-660c-cdf3-8d20-16164b996e40)
-            (location 127.0.0.1:5900)
-        )
-    )
-)
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
deleted file mode 100644
index 6ef05534e4..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<domain type='xen' id='1'>
-  <name>test2vm</name>
-  <uuid>a36f6e38-f498-b06c-5fad-b04947392dbe</uuid>
-  <memory unit='KiB'>524288</memory>
-  <currentMemory unit='KiB'>524288</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <os>
-    <type>linux</type>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='block' device='disk'>
-      <driver name='phy' type='raw'/>
-      <source dev='/dev/vg_dom0test/test2vm'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:36:68:9f:5d'/>
-      <source bridge='virbr0'/>
-      <script path='/etc/xen/scripts/vif-bridge'/>
-      <target dev='vif1.0'/>
-    </interface>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <graphics type='vnc' port='-1' autoport='yes'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='xen' vram='4096' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv.sexpr
deleted file mode 100644
index d582ea0cb5..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.xml b/tests/sexpr2xmldata/sexpr2xml-pv.xml
deleted file mode 100644
index 9aae240832..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr b/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
deleted file mode 100644
index dbaa57632b..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type 'netfront')(rate '10240KB/s'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
deleted file mode 100644
index 4b7cb21031..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='variable' adjustment='0' basis='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file' type='raw'/>
-      <source file='/root/foo.img'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file' type='raw'/>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='xenbus' index='0'/>
-    <controller type='ide' index='0'/>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <bandwidth>
-        <outbound average='10240'/>
-      </bandwidth>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-      <model type='netfront'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
-      <listen type='address'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
-    </video>
-    <memballoon model='xen'/>
-  </devices>
-</domain>
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
deleted file mode 100644
index b2fc4d42fe..0000000000
--- a/tests/sexpr2xmltest.c
+++ /dev/null
@@ -1,170 +0,0 @@
-#include <config.h>
-
-#include <unistd.h>
-
-#include "internal.h"
-#include "virxml.h"
-#include "datatypes.h"
-#include "xenconfig/xen_sxpr.h"
-#include "testutils.h"
-#include "testutilsxen.h"
-#include "virstring.h"
-#include "libxl/libxl_conf.h"
-
-#define VIR_FROM_THIS VIR_FROM_NONE
-
-static virCapsPtr caps;
-static virDomainXMLOptionPtr xmlopt;
-
-static int
-testCompareFiles(const char *xml, const char *sexpr)
-{
-    char *sexprData = NULL;
-    char *gotxml = NULL;
-    int ret = -1;
-    virDomainDefPtr def = NULL;
-
-    if (virTestLoadFile(sexpr, &sexprData) < 0)
-        goto fail;
-
-    if (!(def = xenParseSxprString(sexprData,
-                                   NULL, -1, caps, xmlopt)))
-        goto fail;
-
-    if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
-        fprintf(stderr, "ABI stability check failed on %s", xml);
-        goto fail;
-    }
-
-    if (!(gotxml = virDomainDefFormat(def, caps, 0)))
-        goto fail;
-
-    if (virTestCompareToFile(gotxml, xml) < 0)
-        goto fail;
-
-    ret = 0;
-
- fail:
-    VIR_FREE(sexprData);
-    VIR_FREE(gotxml);
-    virDomainDefFree(def);
-
-    return ret;
-}
-
-struct testInfo {
-    const char *input;
-    const char *output;
-};
-
-static int
-testCompareHelper(const void *data)
-{
-    int result = -1;
-    const struct testInfo *info = data;
-    char *xml = NULL;
-    char *args = NULL;
-
-    if (virAsprintf(&xml, "%s/sexpr2xmldata/sexpr2xml-%s.xml",
-                    abs_srcdir, info->input) < 0 ||
-        virAsprintf(&args, "%s/sexpr2xmldata/sexpr2xml-%s.sexpr",
-                    abs_srcdir, info->output) < 0) {
-        goto cleanup;
-    }
-
-    result = testCompareFiles(xml, args);
-
- cleanup:
-    VIR_FREE(xml);
-    VIR_FREE(args);
-
-    return result;
-}
-
-static int
-mymain(void)
-{
-    int ret = 0;
-
-    if (!(caps = testXLInitCaps()))
-        return EXIT_FAILURE;
-
-    if (!(xmlopt = libxlCreateXMLConf()))
-        return EXIT_FAILURE;
-
-#define DO_TEST(in, out) \
-    do { \
-        struct testInfo info = { in, out }; \
-        virResetLastError(); \
-        if (virTestRun("Xen SEXPR-2-XML " in " -> " out, \
-                       testCompareHelper, &info) < 0) \
-            ret = -1; \
-    } while (0)
-
-    DO_TEST("pv", "pv");
-    DO_TEST("fv", "fv");
-    DO_TEST("pv", "pv");
-    DO_TEST("fv-v2", "fv-v2");
-    DO_TEST("pv-vfb-new", "pv-vfb-new");
-    DO_TEST("pv-vfb-new-vncdisplay", "pv-vfb-new-vncdisplay");
-    DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash");
-    DO_TEST("fv-autoport", "fv-autoport");
-    DO_TEST("pv-bootloader", "pv-bootloader");
-    DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline");
-    DO_TEST("pv-vcpus", "pv-vcpus");
-
-    DO_TEST("disk-file", "disk-file");
-    DO_TEST("disk-block", "disk-block");
-    DO_TEST("disk-block-shareable", "disk-block-shareable");
-    DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw");
-    DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow");
-    DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw");
-
-    DO_TEST("curmem", "curmem");
-    DO_TEST("net-routed", "net-routed");
-    DO_TEST("net-bridged", "net-bridged");
-    DO_TEST("net-e1000", "net-e1000");
-    DO_TEST("bridge-ipaddr", "bridge-ipaddr");
-    DO_TEST("no-source-cdrom", "no-source-cdrom");
-    DO_TEST("pv-localtime", "pv-localtime");
-    DO_TEST("pci-devs", "pci-devs");
-
-    DO_TEST("fv-utc", "fv-utc");
-    DO_TEST("fv-localtime", "fv-localtime");
-    DO_TEST("fv-usbmouse", "fv-usbmouse");
-    DO_TEST("fv-usbtablet", "fv-usbtablet");
-    DO_TEST("fv-kernel", "fv-kernel");
-    DO_TEST("fv-force-hpet", "fv-force-hpet");
-    DO_TEST("fv-force-nohpet", "fv-force-nohpet");
-
-    DO_TEST("fv-serial-null", "fv-serial-null");
-    DO_TEST("fv-serial-file", "fv-serial-file");
-    DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports");
-    DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port");
-    DO_TEST("fv-serial-stdio", "fv-serial-stdio");
-    DO_TEST("fv-serial-pty", "fv-serial-pty");
-    DO_TEST("fv-serial-pipe", "fv-serial-pipe");
-    DO_TEST("fv-serial-tcp", "fv-serial-tcp");
-    DO_TEST("fv-serial-udp", "fv-serial-udp");
-    DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet");
-    DO_TEST("fv-serial-unix", "fv-serial-unix");
-    DO_TEST("fv-parallel-tcp", "fv-parallel-tcp");
-
-    DO_TEST("fv-sound", "fv-sound");
-    DO_TEST("fv-sound-all", "fv-sound-all");
-
-    DO_TEST("fv-net-netfront", "fv-net-netfront");
-
-    DO_TEST("fv-empty-kernel", "fv-empty-kernel");
-
-    DO_TEST("boot-grub", "boot-grub");
-
-    DO_TEST("vif-rate", "vif-rate");
-
-    virObjectUnref(caps);
-    virObjectUnref(xmlopt);
-
-    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-VIR_TEST_MAIN(mymain)
diff --git a/tests/virschematest.c b/tests/virschematest.c
index bffde4ba06..56ee6ec77e 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -216,7 +216,7 @@ mymain(void)
 
     DO_TEST_DIR("capability.rng", "capabilityschemadata", "vircaps2xmldata");
     DO_TEST_DIR("domain.rng", "domainschemadata",
-                "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata",
+                "qemuxml2argvdata", "xmconfigdata",
                 "qemuxml2xmloutdata", "lxcxml2xmldata",
                 "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindata",
                 "genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconfigdata",