tests: Move all data directories to data/

This cleans up the file hierarchy a bit

Signed-off-by: Cole Robinson <crobinso@redhat.com>

397 files changed, 68 insertions, 61 deletions

diff --git a/setup.py b/setup.py
index 1db9e516..cc776598 100755
--- a/setup.py
+++ b/setup.py
@@ -621,8 +621,8 @@ class CheckPylint(distutils.core.Command):
             # pylint: disable=protected-access
             print("running codespell")
             codespell_lib._codespell.main(
-                '-I', 'tests/codespell_dict.txt',
-                '--skip', '*.pyc,*.zip,*.vmdk,*.iso,*.xml', *files)
+                '-I', 'tests/data/codespell_dict.txt',
+                '--skip', '*.pyc,*.iso,*.xml', *files)
         except ImportError:
             print("codespell is not installed. skipping...")
         except Exception as e:
diff --git a/tests/capabilities.py b/tests/capabilities.py
index 9adff61f..d2548267 100644
--- a/tests/capabilities.py
+++ b/tests/capabilities.py
@@ -12,9 +12,12 @@ from virtinst import Capabilities
 from virtinst import DomainCapabilities
 
 
+DATADIR = "tests/data/capabilities"
+
+
 class TestCapabilities(unittest.TestCase):
     def _buildCaps(self, filename):
-        path = os.path.join("tests/capabilities-xml", filename)
+        path = os.path.join(DATADIR, filename)
         conn = utils.URIs.open_testdefault_cached()
         return Capabilities(conn, open(path).read())
 
@@ -64,7 +67,7 @@ class TestCapabilities(unittest.TestCase):
     ##############################
 
     def testDomainCapabilities(self):
-        xml = open("tests/capabilities-xml/test-domcaps.xml").read()
+        xml = open(DATADIR + "/test-domcaps.xml").read()
         caps = DomainCapabilities(utils.URIs.open_testdriver_cached(), xml)
 
         self.assertEqual(caps.os.loader.supported, True)
@@ -75,7 +78,7 @@ class TestCapabilities(unittest.TestCase):
             ["rom", "pflash"])
 
     def testDomainCapabilitiesx86(self):
-        xml = open("tests/capabilities-xml/kvm-x86_64-domcaps.xml").read()
+        xml = open(DATADIR + "/kvm-x86_64-domcaps.xml").read()
         caps = DomainCapabilities(utils.URIs.open_testdriver_cached(), xml)
 
         self.assertEqual(caps.machine, "pc-i440fx-2.1")
diff --git a/tests/clitest.py b/tests/clitest.py
index b5fca8c6..6be56750 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -30,7 +30,7 @@ os.environ["HOME"] = "/tmp"
 os.environ["DISPLAY"] = ":3.4"
 
 TMP_IMAGE_DIR = "/tmp/__virtinst_cli_"
-XMLDIR = "tests/cli-test-xml"
+XMLDIR = "tests/data/clitest"
 OLD_OSINFO = utils.has_old_osinfo()
 NO_OSINFO_UNATTEND = not unattended.OSInstallScript.have_new_libosinfo()
 HAS_ISOINFO = shutil.which("isoinfo")
@@ -453,7 +453,7 @@ class App(object):
 # add_valid: A test that should pass
 # add_invalid: A test that should fail
 # add_compare: Get the generated XML, and compare against the passed filename
-#              in tests/clitest-xml/compare/
+#              in tests/data/clitest/compare/
 #
 
 ######################
diff --git a/tests/clonetest.py b/tests/clonetest.py
index d9d6f288..cad852a1 100644
--- a/tests/clonetest.py
+++ b/tests/clonetest.py
@@ -28,7 +28,7 @@ DISKPOOL = "/dev/disk-pool"
 
 local_files = [FILE1, FILE2]
 
-clonexml_dir = os.path.join(os.getcwd(), "tests/clone-xml")
+clonexml_dir = os.path.join(os.getcwd(), "tests/data/clone")
 
 
 class TestClone(unittest.TestCase):
diff --git a/tests/capabilities-xml/kvm-aarch64-domcaps.xml b/tests/data/capabilities/kvm-aarch64-domcaps.xml
index e515666a..e515666a 100644
--- a/tests/capabilities-xml/kvm-aarch64-domcaps.xml
+++ b/tests/data/capabilities/kvm-aarch64-domcaps.xml
diff --git a/tests/capabilities-xml/kvm-aarch64.xml b/tests/data/capabilities/kvm-aarch64.xml
index c1aa1e03..c1aa1e03 100644
--- a/tests/capabilities-xml/kvm-aarch64.xml
+++ b/tests/data/capabilities/kvm-aarch64.xml
diff --git a/tests/capabilities-xml/kvm-armv7l.xml b/tests/data/capabilities/kvm-armv7l.xml
index 3f8ff1db..3f8ff1db 100644
--- a/tests/capabilities-xml/kvm-armv7l.xml
+++ b/tests/data/capabilities/kvm-armv7l.xml
diff --git a/tests/capabilities-xml/kvm-ppc64le.xml b/tests/data/capabilities/kvm-ppc64le.xml
index 7338c3ec..7338c3ec 100644
--- a/tests/capabilities-xml/kvm-ppc64le.xml
+++ b/tests/data/capabilities/kvm-ppc64le.xml
diff --git a/tests/capabilities-xml/kvm-s390x-KVMIBM.xml b/tests/data/capabilities/kvm-s390x-KVMIBM.xml
index f57278fc..f57278fc 100644
--- a/tests/capabilities-xml/kvm-s390x-KVMIBM.xml
+++ b/tests/data/capabilities/kvm-s390x-KVMIBM.xml
diff --git a/tests/capabilities-xml/kvm-s390x.xml b/tests/data/capabilities/kvm-s390x.xml
index 039c2e0d..039c2e0d 100644
--- a/tests/capabilities-xml/kvm-s390x.xml
+++ b/tests/data/capabilities/kvm-s390x.xml
diff --git a/tests/capabilities-xml/kvm-x86_64-domcaps-amd-sev.xml b/tests/data/capabilities/kvm-x86_64-domcaps-amd-sev.xml
index 9a1ab5db..9a1ab5db 100644
--- a/tests/capabilities-xml/kvm-x86_64-domcaps-amd-sev.xml
+++ b/tests/data/capabilities/kvm-x86_64-domcaps-amd-sev.xml
diff --git a/tests/capabilities-xml/kvm-x86_64-domcaps-q35.xml b/tests/data/capabilities/kvm-x86_64-domcaps-q35.xml
index b4300cfa..b4300cfa 100644
--- a/tests/capabilities-xml/kvm-x86_64-domcaps-q35.xml
+++ b/tests/data/capabilities/kvm-x86_64-domcaps-q35.xml
diff --git a/tests/capabilities-xml/kvm-x86_64-domcaps.xml b/tests/data/capabilities/kvm-x86_64-domcaps.xml
index 451f5844..451f5844 100644
--- a/tests/capabilities-xml/kvm-x86_64-domcaps.xml
+++ b/tests/data/capabilities/kvm-x86_64-domcaps.xml
diff --git a/tests/capabilities-xml/kvm-x86_64-rhel7-domcaps.xml b/tests/data/capabilities/kvm-x86_64-rhel7-domcaps.xml
index 904ad70b..904ad70b 100644
--- a/tests/capabilities-xml/kvm-x86_64-rhel7-domcaps.xml
+++ b/tests/data/capabilities/kvm-x86_64-rhel7-domcaps.xml
diff --git a/tests/capabilities-xml/kvm-x86_64-rhel7.xml b/tests/data/capabilities/kvm-x86_64-rhel7.xml
index d1c72fa0..d1c72fa0 100644
--- a/tests/capabilities-xml/kvm-x86_64-rhel7.xml
+++ b/tests/data/capabilities/kvm-x86_64-rhel7.xml
diff --git a/tests/capabilities-xml/kvm-x86_64.xml b/tests/data/capabilities/kvm-x86_64.xml
index c0824993..c0824993 100644
--- a/tests/capabilities-xml/kvm-x86_64.xml
+++ b/tests/data/capabilities/kvm-x86_64.xml
diff --git a/tests/capabilities-xml/lxc.xml b/tests/data/capabilities/lxc.xml
index 5740fde8..5740fde8 100644
--- a/tests/capabilities-xml/lxc.xml
+++ b/tests/data/capabilities/lxc.xml
diff --git a/tests/capabilities-xml/qemu-riscv64-domcaps.xml b/tests/data/capabilities/qemu-riscv64-domcaps.xml
index 6b1a7498..6b1a7498 100644
--- a/tests/capabilities-xml/qemu-riscv64-domcaps.xml
+++ b/tests/data/capabilities/qemu-riscv64-domcaps.xml
diff --git a/tests/capabilities-xml/qemu-riscv64.xml b/tests/data/capabilities/qemu-riscv64.xml
index c8b69f15..c8b69f15 100644
--- a/tests/capabilities-xml/qemu-riscv64.xml
+++ b/tests/data/capabilities/qemu-riscv64.xml
diff --git a/tests/capabilities-xml/test-domcaps.xml b/tests/data/capabilities/test-domcaps.xml
index 96202bca..96202bca 100644
--- a/tests/capabilities-xml/test-domcaps.xml
+++ b/tests/data/capabilities/test-domcaps.xml
diff --git a/tests/capabilities-xml/test-empty.xml b/tests/data/capabilities/test-empty.xml
index b5146aa8..b5146aa8 100644
--- a/tests/capabilities-xml/test-empty.xml
+++ b/tests/data/capabilities/test-empty.xml
diff --git a/tests/capabilities-xml/test-qemu-no-kvm.xml b/tests/data/capabilities/test-qemu-no-kvm.xml
index 108fc7b2..108fc7b2 100644
--- a/tests/capabilities-xml/test-qemu-no-kvm.xml
+++ b/tests/data/capabilities/test-qemu-no-kvm.xml
diff --git a/tests/capabilities-xml/test-qemu-with-kvm.xml b/tests/data/capabilities/test-qemu-with-kvm.xml
index ee14573a..ee14573a 100644
--- a/tests/capabilities-xml/test-qemu-with-kvm.xml
+++ b/tests/data/capabilities/test-qemu-with-kvm.xml
diff --git a/tests/capabilities-xml/vz.xml b/tests/data/capabilities/vz.xml
index 318f5b03..318f5b03 100644
--- a/tests/capabilities-xml/vz.xml
+++ b/tests/data/capabilities/vz.xml
diff --git a/tests/capabilities-xml/xen-rhel5.4.xml b/tests/data/capabilities/xen-rhel5.4.xml
index e7be7748..e7be7748 100644
--- a/tests/capabilities-xml/xen-rhel5.4.xml
+++ b/tests/data/capabilities/xen-rhel5.4.xml
diff --git a/tests/cli-test-xml/admin-password.txt b/tests/data/clitest/admin-password.txt
index 323fae03..323fae03 100644
--- a/tests/cli-test-xml/admin-password.txt
+++ b/tests/data/clitest/admin-password.txt
diff --git a/tests/cli-test-xml/clone-disk-managed.xml b/tests/data/clitest/clone-disk-managed.xml
index 8fe1fe2d..8fe1fe2d 100644
--- a/tests/cli-test-xml/clone-disk-managed.xml
+++ b/tests/data/clitest/clone-disk-managed.xml
diff --git a/tests/cli-test-xml/clone-disk-noexist.xml b/tests/data/clitest/clone-disk-noexist.xml
index d99b1aec..d99b1aec 100644
--- a/tests/cli-test-xml/clone-disk-noexist.xml
+++ b/tests/data/clitest/clone-disk-noexist.xml
diff --git a/tests/cli-test-xml/clone-disk.xml b/tests/data/clitest/clone-disk.xml
index da1eb0a6..da1eb0a6 100644
--- a/tests/cli-test-xml/clone-disk.xml
+++ b/tests/data/clitest/clone-disk.xml
diff --git a/tests/cli-test-xml/clone-nvram-auto.xml b/tests/data/clitest/clone-nvram-auto.xml
index dc95f6ac..dc95f6ac 100644
--- a/tests/cli-test-xml/clone-nvram-auto.xml
+++ b/tests/data/clitest/clone-nvram-auto.xml
diff --git a/tests/cli-test-xml/cloudinit/meta-data.txt b/tests/data/clitest/cloudinit/meta-data.txt
index 21dcae42..21dcae42 100644
--- a/tests/cli-test-xml/cloudinit/meta-data.txt
+++ b/tests/data/clitest/cloudinit/meta-data.txt
diff --git a/tests/cli-test-xml/cloudinit/ssh-key.txt b/tests/data/clitest/cloudinit/ssh-key.txt
index 385cf112..385cf112 100644
--- a/tests/cli-test-xml/cloudinit/ssh-key.txt
+++ b/tests/data/clitest/cloudinit/ssh-key.txt
diff --git a/tests/cli-test-xml/cloudinit/user-data.txt b/tests/data/clitest/cloudinit/user-data.txt
index 620c3c20..620c3c20 100644
--- a/tests/cli-test-xml/cloudinit/user-data.txt
+++ b/tests/data/clitest/cloudinit/user-data.txt
diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml b/tests/data/clitest/compare/virt-clone-clone-auto1.xml
index 67360bcb..67360bcb 100644
--- a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
+++ b/tests/data/clitest/compare/virt-clone-clone-auto1.xml
diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml b/tests/data/clitest/compare/virt-clone-clone-auto2.xml
index 7ede76cd..7ede76cd 100644
--- a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
+++ b/tests/data/clitest/compare/virt-clone-clone-auto2.xml
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml b/tests/data/clitest/compare/virt-install-aarch64-cdrom.xml
index 6d2ec066..6d2ec066 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
+++ b/tests/data/clitest/compare/virt-install-aarch64-cdrom.xml
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-firmware-no-override.xml b/tests/data/clitest/compare/virt-install-aarch64-firmware-no-override.xml
index e899ef00..e899ef00 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-firmware-no-override.xml
+++ b/tests/data/clitest/compare/virt-install-aarch64-firmware-no-override.xml
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml b/tests/data/clitest/compare/virt-install-aarch64-graphics.xml
index 3c6cdfde..3c6cdfde 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml
+++ b/tests/data/clitest/compare/virt-install-aarch64-graphics.xml
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-headless.xml b/tests/data/clitest/compare/virt-install-aarch64-headless.xml
index d6f23cc1..d6f23cc1 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-headless.xml
+++ b/tests/data/clitest/compare/virt-install-aarch64-headless.xml
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml b/tests/data/clitest/compare/virt-install-aarch64-kvm-gic.xml
index dc844ce4..dc844ce4 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
+++ b/tests/data/clitest/compare/virt-install-aarch64-kvm-gic.xml
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml b/tests/data/clitest/compare/virt-install-aarch64-kvm-import.xml
index dd2e2238..dd2e2238 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
+++ b/tests/data/clitest/compare/virt-install-aarch64-kvm-import.xml
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml b/tests/data/clitest/compare/virt-install-aarch64-machdefault.xml
index 597d15a4..597d15a4 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
+++ b/tests/data/clitest/compare/virt-install-aarch64-machdefault.xml
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml b/tests/data/clitest/compare/virt-install-aarch64-machvirt.xml
index 597d15a4..597d15a4 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
+++ b/tests/data/clitest/compare/virt-install-aarch64-machvirt.xml
diff --git a/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml b/tests/data/clitest/compare/virt-install-arm-defaultmach-f20.xml
index 02c53dc1..02c53dc1 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
+++ b/tests/data/clitest/compare/virt-install-arm-defaultmach-f20.xml
diff --git a/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml b/tests/data/clitest/compare/virt-install-arm-kvm-import.xml
index bd00f6c9..bd00f6c9 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
+++ b/tests/data/clitest/compare/virt-install-arm-kvm-import.xml
diff --git a/tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml b/tests/data/clitest/compare/virt-install-arm-vexpress-plain.xml
index afaf37e8..afaf37e8 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml
+++ b/tests/data/clitest/compare/virt-install-arm-vexpress-plain.xml
diff --git a/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml b/tests/data/clitest/compare/virt-install-arm-virt-f20.xml
index 98f6827f..98f6827f 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
+++ b/tests/data/clitest/compare/virt-install-arm-virt-f20.xml
diff --git a/tests/cli-test-xml/compare/virt-install-boot-loader-secure.xml b/tests/data/clitest/compare/virt-install-boot-loader-secure.xml
index fe6ad438..fe6ad438 100644
--- a/tests/cli-test-xml/compare/virt-install-boot-loader-secure.xml
+++ b/tests/data/clitest/compare/virt-install-boot-loader-secure.xml
diff --git a/tests/cli-test-xml/compare/virt-install-boot-uefi.xml b/tests/data/clitest/compare/virt-install-boot-uefi.xml
index c97f86fc..c97f86fc 100644
--- a/tests/cli-test-xml/compare/virt-install-boot-uefi.xml
+++ b/tests/data/clitest/compare/virt-install-boot-uefi.xml
diff --git a/tests/cli-test-xml/compare/virt-install-cdrom-centos-label.xml b/tests/data/clitest/compare/virt-install-cdrom-centos-label.xml
index e607e82f..3fbea52a 100644
--- a/tests/cli-test-xml/compare/virt-install-cdrom-centos-label.xml
+++ b/tests/data/clitest/compare/virt-install-cdrom-centos-label.xml
@@ -39,7 +39,7 @@
     </disk>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
-      <source file="tests/cli-test-xml/fake-centos65-label.iso"/>
+      <source file="tests/data/clitest/fake-centos65-label.iso"/>
       <target dev="hda" bus="ide"/>
       <readonly/>
     </disk>
diff --git a/tests/cli-test-xml/compare/virt-install-cdrom-double.xml b/tests/data/clitest/compare/virt-install-cdrom-double.xml
index 002ca71f..002ca71f 100644
--- a/tests/cli-test-xml/compare/virt-install-cdrom-double.xml
+++ b/tests/data/clitest/compare/virt-install-cdrom-double.xml
diff --git a/tests/cli-test-xml/compare/virt-install-cdrom-url.xml b/tests/data/clitest/compare/virt-install-cdrom-url.xml
index 890cb19a..890cb19a 100644
--- a/tests/cli-test-xml/compare/virt-install-cdrom-url.xml
+++ b/tests/data/clitest/compare/virt-install-cdrom-url.xml
diff --git a/tests/cli-test-xml/compare/virt-install-cloud-init-default.xml b/tests/data/clitest/compare/virt-install-cloud-init-default.xml
index 93309bbe..93309bbe 100644
--- a/tests/cli-test-xml/compare/virt-install-cloud-init-default.xml
+++ b/tests/data/clitest/compare/virt-install-cloud-init-default.xml
diff --git a/tests/cli-test-xml/compare/virt-install-cloud-init-options.xml b/tests/data/clitest/compare/virt-install-cloud-init-options.xml
index 93309bbe..93309bbe 100644
--- a/tests/cli-test-xml/compare/virt-install-cloud-init-options.xml
+++ b/tests/data/clitest/compare/virt-install-cloud-init-options.xml
diff --git a/tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml b/tests/data/clitest/compare/virt-install-cpu-disable-sec.xml
index f83191b4..f83191b4 100644
--- a/tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml
+++ b/tests/data/clitest/compare/virt-install-cpu-disable-sec.xml
diff --git a/tests/cli-test-xml/compare/virt-install-cpu-rhel7-default.xml b/tests/data/clitest/compare/virt-install-cpu-rhel7-default.xml
index 478118c4..478118c4 100644
--- a/tests/cli-test-xml/compare/virt-install-cpu-rhel7-default.xml
+++ b/tests/data/clitest/compare/virt-install-cpu-rhel7-default.xml
diff --git a/tests/cli-test-xml/compare/virt-install-cpuset-auto.xml b/tests/data/clitest/compare/virt-install-cpuset-auto.xml
index 85e6672c..85e6672c 100644
--- a/tests/cli-test-xml/compare/virt-install-cpuset-auto.xml
+++ b/tests/data/clitest/compare/virt-install-cpuset-auto.xml
diff --git a/tests/cli-test-xml/compare/virt-install-default-f27.xml b/tests/data/clitest/compare/virt-install-default-f27.xml
index b4df2bd2..b4df2bd2 100644
--- a/tests/cli-test-xml/compare/virt-install-default-f27.xml
+++ b/tests/data/clitest/compare/virt-install-default-f27.xml
diff --git a/tests/cli-test-xml/compare/virt-install-default.xml b/tests/data/clitest/compare/virt-install-default.xml
index e88ccbc3..e88ccbc3 100644
--- a/tests/cli-test-xml/compare/virt-install-default.xml
+++ b/tests/data/clitest/compare/virt-install-default.xml
diff --git a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml b/tests/data/clitest/compare/virt-install-f21-kvm-remote.xml
index c5a9a407..c5a9a407 100644
--- a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
+++ b/tests/data/clitest/compare/virt-install-f21-kvm-remote.xml
diff --git a/tests/cli-test-xml/compare/virt-install-fake-ftp.xml b/tests/data/clitest/compare/virt-install-fake-ftp.xml
index 48190da1..48190da1 100644
--- a/tests/cli-test-xml/compare/virt-install-fake-ftp.xml
+++ b/tests/data/clitest/compare/virt-install-fake-ftp.xml
diff --git a/tests/cli-test-xml/compare/virt-install-fake-http.xml b/tests/data/clitest/compare/virt-install-fake-http.xml
index 8292e63a..8292e63a 100644
--- a/tests/cli-test-xml/compare/virt-install-fake-http.xml
+++ b/tests/data/clitest/compare/virt-install-fake-http.xml
diff --git a/tests/cli-test-xml/compare/virt-install-fs-default.xml b/tests/data/clitest/compare/virt-install-fs-default.xml
index 7344fc4c..7344fc4c 100644
--- a/tests/cli-test-xml/compare/virt-install-fs-default.xml
+++ b/tests/data/clitest/compare/virt-install-fs-default.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml b/tests/data/clitest/compare/virt-install-kvm-centos7.xml
index 8cf905dc..8cf905dc 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-centos7.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-cpu-default-fallback.xml b/tests/data/clitest/compare/virt-install-kvm-cpu-default-fallback.xml
index d3b862cb..d3b862cb 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-cpu-default-fallback.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-cpu-default-fallback.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml b/tests/data/clitest/compare/virt-install-kvm-fedoralatest-url.xml
index a55e7cee..a55e7cee 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-fedoralatest-url.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-hostcopy-fallback.xml b/tests/data/clitest/compare/virt-install-kvm-hostcopy-fallback.xml
index ca28ba42..ca28ba42 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-hostcopy-fallback.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-hostcopy-fallback.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-i686-uefi.xml b/tests/data/clitest/compare/virt-install-kvm-i686-uefi.xml
index 9c86bde8..9c86bde8 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-i686-uefi.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-i686-uefi.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel5.xml b/tests/data/clitest/compare/virt-install-kvm-rhel5.xml
index ef09190c..ef09190c 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel5.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-rhel5.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml b/tests/data/clitest/compare/virt-install-kvm-rhel6.xml
index bef67674..bef67674 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-rhel6.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml b/tests/data/clitest/compare/virt-install-kvm-rhel7.xml
index ed21e080..ed21e080 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-rhel7.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml b/tests/data/clitest/compare/virt-install-kvm-session-defaults.xml
index 0c91b849..0c91b849 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-session-defaults.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-win10.xml b/tests/data/clitest/compare/virt-install-kvm-win10.xml
index 9197de73..9197de73 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-win10.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-win10.xml
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml b/tests/data/clitest/compare/virt-install-kvm-win2k3-cdrom.xml
index f5bef098..f5bef098 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
+++ b/tests/data/clitest/compare/virt-install-kvm-win2k3-cdrom.xml
diff --git a/tests/cli-test-xml/compare/virt-install-location-iso.xml b/tests/data/clitest/compare/virt-install-location-iso.xml
index e8bf472b..d83e506d 100644
--- a/tests/cli-test-xml/compare/virt-install-location-iso.xml
+++ b/tests/data/clitest/compare/virt-install-location-iso.xml
@@ -39,7 +39,7 @@
     </disk>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
-      <source file="tests/cli-test-xml/fake-fedora17-tree.iso"/>
+      <source file="tests/data/clitest/fake-fedora17-tree.iso"/>
       <target dev="hda" bus="ide"/>
       <readonly/>
     </disk>
diff --git a/tests/cli-test-xml/compare/virt-install-location-manual-kernel.xml b/tests/data/clitest/compare/virt-install-location-manual-kernel.xml
index 1e847d29..12d10510 100644
--- a/tests/cli-test-xml/compare/virt-install-location-manual-kernel.xml
+++ b/tests/data/clitest/compare/virt-install-location-manual-kernel.xml
@@ -29,7 +29,7 @@
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
-      <source file="tests/cli-test-xml/fake-no-osinfo.iso"/>
+      <source file="tests/data/clitest/fake-no-osinfo.iso"/>
       <target dev="hda" bus="ide"/>
       <readonly/>
     </disk>
diff --git a/tests/cli-test-xml/compare/virt-install-manual-init.xml b/tests/data/clitest/compare/virt-install-manual-init.xml
index cff1d3d9..cff1d3d9 100644
--- a/tests/cli-test-xml/compare/virt-install-manual-init.xml
+++ b/tests/data/clitest/compare/virt-install-manual-init.xml
diff --git a/tests/cli-test-xml/compare/virt-install-many-devices.xml b/tests/data/clitest/compare/virt-install-many-devices.xml
index 5370a2ff..5370a2ff 100644
--- a/tests/cli-test-xml/compare/virt-install-many-devices.xml
+++ b/tests/data/clitest/compare/virt-install-many-devices.xml
diff --git a/tests/cli-test-xml/compare/virt-install-memory-hotplug.xml b/tests/data/clitest/compare/virt-install-memory-hotplug.xml
index 897a6c47..897a6c47 100644
--- a/tests/cli-test-xml/compare/virt-install-memory-hotplug.xml
+++ b/tests/data/clitest/compare/virt-install-memory-hotplug.xml
diff --git a/tests/cli-test-xml/compare/virt-install-memory-option-backcompat.xml b/tests/data/clitest/compare/virt-install-memory-option-backcompat.xml
index ebb2e923..ebb2e923 100644
--- a/tests/cli-test-xml/compare/virt-install-memory-option-backcompat.xml
+++ b/tests/data/clitest/compare/virt-install-memory-option-backcompat.xml
diff --git a/tests/cli-test-xml/compare/virt-install-network-install-resources.xml b/tests/data/clitest/compare/virt-install-network-install-resources.xml
index 03595873..03595873 100644
--- a/tests/cli-test-xml/compare/virt-install-network-install-resources.xml
+++ b/tests/data/clitest/compare/virt-install-network-install-resources.xml
diff --git a/tests/cli-test-xml/compare/virt-install-noargs-fail.xml b/tests/data/clitest/compare/virt-install-noargs-fail.xml
index 67af1506..67af1506 100644
--- a/tests/cli-test-xml/compare/virt-install-noargs-fail.xml
+++ b/tests/data/clitest/compare/virt-install-noargs-fail.xml
diff --git a/tests/cli-test-xml/compare/virt-install-openbsd-defaults.xml b/tests/data/clitest/compare/virt-install-openbsd-defaults.xml
index ecaf1270..ecaf1270 100644
--- a/tests/cli-test-xml/compare/virt-install-openbsd-defaults.xml
+++ b/tests/data/clitest/compare/virt-install-openbsd-defaults.xml
diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-multiple-short-id.xml b/tests/data/clitest/compare/virt-install-osinfo-multiple-short-id.xml
index 13d9a59d..13d9a59d 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-multiple-short-id.xml
+++ b/tests/data/clitest/compare/virt-install-osinfo-multiple-short-id.xml
diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml b/tests/data/clitest/compare/virt-install-osinfo-netinst-unattended.xml
index e61db7b8..db4f09a6 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml
+++ b/tests/data/clitest/compare/virt-install-osinfo-netinst-unattended.xml
@@ -34,7 +34,7 @@
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
-      <source file="tests/cli-test-xml/fake-f26-netinst.iso"/>
+      <source file="tests/data/clitest/fake-f26-netinst.iso"/>
       <target dev="sda" bus="sata"/>
       <readonly/>
     </disk>
diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-url-unattended.xml b/tests/data/clitest/compare/virt-install-osinfo-url-unattended.xml
index 35f3c6ca..35f3c6ca 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-url-unattended.xml
+++ b/tests/data/clitest/compare/virt-install-osinfo-url-unattended.xml
diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-url-with-disk.xml b/tests/data/clitest/compare/virt-install-osinfo-url-with-disk.xml
index 37b7e575..37b7e575 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-url-with-disk.xml
+++ b/tests/data/clitest/compare/virt-install-osinfo-url-with-disk.xml
diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-url.xml b/tests/data/clitest/compare/virt-install-osinfo-url.xml
index 68a7932c..68a7932c 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-url.xml
+++ b/tests/data/clitest/compare/virt-install-osinfo-url.xml
diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml b/tests/data/clitest/compare/virt-install-osinfo-win7-unattended.xml
index 5136e5f1..fcf83bde 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml
+++ b/tests/data/clitest/compare/virt-install-osinfo-win7-unattended.xml
@@ -38,7 +38,7 @@
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
-      <source file="tests/cli-test-xml/fake-win7.iso"/>
+      <source file="tests/data/clitest/fake-win7.iso"/>
       <target dev="sda" bus="sata"/>
       <readonly/>
     </disk>
@@ -113,7 +113,7 @@
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
-      <source file="tests/cli-test-xml/fake-win7.iso"/>
+      <source file="tests/data/clitest/fake-win7.iso"/>
       <target dev="sda" bus="sata"/>
       <readonly/>
     </disk>
diff --git a/tests/cli-test-xml/compare/virt-install-osvariant-defaults-pxe.xml b/tests/data/clitest/compare/virt-install-osvariant-defaults-pxe.xml
index f07b7ca4..f07b7ca4 100644
--- a/tests/cli-test-xml/compare/virt-install-osvariant-defaults-pxe.xml
+++ b/tests/data/clitest/compare/virt-install-osvariant-defaults-pxe.xml
diff --git a/tests/cli-test-xml/compare/virt-install-osvariant-noargs-fail.xml b/tests/data/clitest/compare/virt-install-osvariant-noargs-fail.xml
index 961ae4c6..961ae4c6 100644
--- a/tests/cli-test-xml/compare/virt-install-osvariant-noargs-fail.xml
+++ b/tests/data/clitest/compare/virt-install-osvariant-noargs-fail.xml
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-graphics.xml b/tests/data/clitest/compare/virt-install-ppc64-graphics.xml
index 4a8640fc..4a8640fc 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-graphics.xml
+++ b/tests/data/clitest/compare/virt-install-ppc64-graphics.xml
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-headless.xml b/tests/data/clitest/compare/virt-install-ppc64-headless.xml
index a8434510..a8434510 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-headless.xml
+++ b/tests/data/clitest/compare/virt-install-ppc64-headless.xml
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml b/tests/data/clitest/compare/virt-install-ppc64-machdefault-f20.xml
index 2f5cdc33..2f5cdc33 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
+++ b/tests/data/clitest/compare/virt-install-ppc64-machdefault-f20.xml
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml b/tests/data/clitest/compare/virt-install-ppc64-pseries-f20.xml
index 1960448b..1960448b 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
+++ b/tests/data/clitest/compare/virt-install-ppc64-pseries-f20.xml
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml b/tests/data/clitest/compare/virt-install-ppc64le-kvm-import.xml
index e9339ac5..e9339ac5 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
+++ b/tests/data/clitest/compare/virt-install-ppc64le-kvm-import.xml
diff --git a/tests/cli-test-xml/compare/virt-install-q35-defaults.xml b/tests/data/clitest/compare/virt-install-q35-defaults.xml
index d75e2869..d75e2869 100644
--- a/tests/cli-test-xml/compare/virt-install-q35-defaults.xml
+++ b/tests/data/clitest/compare/virt-install-q35-defaults.xml
diff --git a/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml b/tests/data/clitest/compare/virt-install-qemu-32-on-64.xml
index 19955f0e..19955f0e 100644
--- a/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
+++ b/tests/data/clitest/compare/virt-install-qemu-32-on-64.xml
diff --git a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml b/tests/data/clitest/compare/virt-install-qemu-plain.xml
index af3948d9..af3948d9 100644
--- a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
+++ b/tests/data/clitest/compare/virt-install-qemu-plain.xml
diff --git a/tests/cli-test-xml/compare/virt-install-quiet-url.xml b/tests/data/clitest/compare/virt-install-quiet-url.xml
index e69de29b..e69de29b 100644
--- a/tests/cli-test-xml/compare/virt-install-quiet-url.xml
+++ b/tests/data/clitest/compare/virt-install-quiet-url.xml
diff --git a/tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml b/tests/data/clitest/compare/virt-install-riscv64-graphics.xml
index 200d5a28..200d5a28 100644
--- a/tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml
+++ b/tests/data/clitest/compare/virt-install-riscv64-graphics.xml
diff --git a/tests/cli-test-xml/compare/virt-install-riscv64-headless.xml b/tests/data/clitest/compare/virt-install-riscv64-headless.xml
index b7863bc8..b7863bc8 100644
--- a/tests/cli-test-xml/compare/virt-install-riscv64-headless.xml
+++ b/tests/data/clitest/compare/virt-install-riscv64-headless.xml
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml b/tests/data/clitest/compare/virt-install-s390x-cdrom-KVMIBM.xml
index a2e40ec2..a2e40ec2 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
+++ b/tests/data/clitest/compare/virt-install-s390x-cdrom-KVMIBM.xml
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml b/tests/data/clitest/compare/virt-install-s390x-cdrom.xml
index 7161a1d0..7161a1d0 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
+++ b/tests/data/clitest/compare/virt-install-s390x-cdrom.xml
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-graphics.xml b/tests/data/clitest/compare/virt-install-s390x-graphics.xml
index f96abb00..f96abb00 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-graphics.xml
+++ b/tests/data/clitest/compare/virt-install-s390x-graphics.xml
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-headless.xml b/tests/data/clitest/compare/virt-install-s390x-headless.xml
index 863b69a0..863b69a0 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-headless.xml
+++ b/tests/data/clitest/compare/virt-install-s390x-headless.xml
diff --git a/tests/cli-test-xml/compare/virt-install-simple-pxe.xml b/tests/data/clitest/compare/virt-install-simple-pxe.xml
index 577470a0..577470a0 100644
--- a/tests/cli-test-xml/compare/virt-install-simple-pxe.xml
+++ b/tests/data/clitest/compare/virt-install-simple-pxe.xml
diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml b/tests/data/clitest/compare/virt-install-singleton-config-1.xml
index 518a0099..518a0099 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
+++ b/tests/data/clitest/compare/virt-install-singleton-config-1.xml
diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml b/tests/data/clitest/compare/virt-install-singleton-config-2.xml
index 117a1076..117a1076 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
+++ b/tests/data/clitest/compare/virt-install-singleton-config-2.xml
diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-3.xml b/tests/data/clitest/compare/virt-install-singleton-config-3.xml
index cc26ff3b..cc26ff3b 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-3.xml
+++ b/tests/data/clitest/compare/virt-install-singleton-config-3.xml
diff --git a/tests/cli-test-xml/compare/virt-install-test-url-detection.xml b/tests/data/clitest/compare/virt-install-test-url-detection.xml
index e7fec4d2..e7fec4d2 100644
--- a/tests/cli-test-xml/compare/virt-install-test-url-detection.xml
+++ b/tests/data/clitest/compare/virt-install-test-url-detection.xml
diff --git a/tests/cli-test-xml/compare/virt-install-vz-ct-template.xml b/tests/data/clitest/compare/virt-install-vz-ct-template.xml
index 4b1ccb33..4b1ccb33 100644
--- a/tests/cli-test-xml/compare/virt-install-vz-ct-template.xml
+++ b/tests/data/clitest/compare/virt-install-vz-ct-template.xml
diff --git a/tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml b/tests/data/clitest/compare/virt-install-w2k3-cdrom.xml
index 12154ebd..12154ebd 100644
--- a/tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
+++ b/tests/data/clitest/compare/virt-install-w2k3-cdrom.xml
diff --git a/tests/cli-test-xml/compare/virt-install-win7-uefi.xml b/tests/data/clitest/compare/virt-install-win7-uefi.xml
index 6a341f5e..6a341f5e 100644
--- a/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
+++ b/tests/data/clitest/compare/virt-install-win7-uefi.xml
diff --git a/tests/cli-test-xml/compare/virt-install-x86_64-graphics.xml b/tests/data/clitest/compare/virt-install-x86_64-graphics.xml
index ea9b184f..ea9b184f 100644
--- a/tests/cli-test-xml/compare/virt-install-x86_64-graphics.xml
+++ b/tests/data/clitest/compare/virt-install-x86_64-graphics.xml
diff --git a/tests/cli-test-xml/compare/virt-install-x86_64-headless.xml b/tests/data/clitest/compare/virt-install-x86_64-headless.xml
index 8234c958..8234c958 100644
--- a/tests/cli-test-xml/compare/virt-install-x86_64-headless.xml
+++ b/tests/data/clitest/compare/virt-install-x86_64-headless.xml
diff --git a/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev-full.xml b/tests/data/clitest/compare/virt-install-x86_64-launch-security-sev-full.xml
index b58294ed..b58294ed 100644
--- a/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev-full.xml
+++ b/tests/data/clitest/compare/virt-install-x86_64-launch-security-sev-full.xml
diff --git a/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev.xml b/tests/data/clitest/compare/virt-install-x86_64-launch-security-sev.xml
index 21355954..21355954 100644
--- a/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev.xml
+++ b/tests/data/clitest/compare/virt-install-x86_64-launch-security-sev.xml
diff --git a/tests/cli-test-xml/compare/virt-install-xen-default.xml b/tests/data/clitest/compare/virt-install-xen-default.xml
index 9576725d..9576725d 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-default.xml
+++ b/tests/data/clitest/compare/virt-install-xen-default.xml
diff --git a/tests/cli-test-xml/compare/virt-install-xen-hvm.xml b/tests/data/clitest/compare/virt-install-xen-hvm.xml
index bc95c9ca..bc95c9ca 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-hvm.xml
+++ b/tests/data/clitest/compare/virt-install-xen-hvm.xml
diff --git a/tests/cli-test-xml/compare/virt-install-xen-pv.xml b/tests/data/clitest/compare/virt-install-xen-pv.xml
index e5d961d4..e5d961d4 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-pv.xml
+++ b/tests/data/clitest/compare/virt-install-xen-pv.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-add-disk-basic-start.xml b/tests/data/clitest/compare/virt-xml-add-disk-basic-start.xml
index 0071d9e7..0071d9e7 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-disk-basic-start.xml
+++ b/tests/data/clitest/compare/virt-xml-add-disk-basic-start.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-add-disk-basic.xml b/tests/data/clitest/compare/virt-xml-add-disk-basic.xml
index 8035c31f..8035c31f 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-disk-basic.xml
+++ b/tests/data/clitest/compare/virt-xml-add-disk-basic.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-add-disk-create-storage-start.xml b/tests/data/clitest/compare/virt-xml-add-disk-create-storage-start.xml
index 6a02dcc3..6a02dcc3 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-disk-create-storage-start.xml
+++ b/tests/data/clitest/compare/virt-xml-add-disk-create-storage-start.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-add-disk-create-storage.xml b/tests/data/clitest/compare/virt-xml-add-disk-create-storage.xml
index 7fd92ac4..7fd92ac4 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-disk-create-storage.xml
+++ b/tests/data/clitest/compare/virt-xml-add-disk-create-storage.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-add-disk-default-storage.xml b/tests/data/clitest/compare/virt-xml-add-disk-default-storage.xml
index 825468ff..825468ff 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-disk-default-storage.xml
+++ b/tests/data/clitest/compare/virt-xml-add-disk-default-storage.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-add-disk-notarget.xml b/tests/data/clitest/compare/virt-xml-add-disk-notarget.xml
index eb55c3b7..eb55c3b7 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-disk-notarget.xml
+++ b/tests/data/clitest/compare/virt-xml-add-disk-notarget.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-add-host-device-start.xml b/tests/data/clitest/compare/virt-xml-add-host-device-start.xml
index b3db5279..b3db5279 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-host-device-start.xml
+++ b/tests/data/clitest/compare/virt-xml-add-host-device-start.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-add-host-device.xml b/tests/data/clitest/compare/virt-xml-add-host-device.xml
index 099fe853..099fe853 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-host-device.xml
+++ b/tests/data/clitest/compare/virt-xml-add-host-device.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-add-sound.xml b/tests/data/clitest/compare/virt-xml-add-sound.xml
index 2d8911c6..2d8911c6 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-sound.xml
+++ b/tests/data/clitest/compare/virt-xml-add-sound.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-build-blkiotune.xml b/tests/data/clitest/compare/virt-xml-build-blkiotune.xml
index 09a13676..09a13676 100644
--- a/tests/cli-test-xml/compare/virt-xml-build-blkiotune.xml
+++ b/tests/data/clitest/compare/virt-xml-build-blkiotune.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-build-cpu.xml b/tests/data/clitest/compare/virt-xml-build-cpu.xml
index 33ba979d..33ba979d 100644
--- a/tests/cli-test-xml/compare/virt-xml-build-cpu.xml
+++ b/tests/data/clitest/compare/virt-xml-build-cpu.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-build-disk-domain.xml b/tests/data/clitest/compare/virt-xml-build-disk-domain.xml
index 76af6280..76af6280 100644
--- a/tests/cli-test-xml/compare/virt-xml-build-disk-domain.xml
+++ b/tests/data/clitest/compare/virt-xml-build-disk-domain.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-build-disk-plain.xml b/tests/data/clitest/compare/virt-xml-build-disk-plain.xml
index ee17622a..ee17622a 100644
--- a/tests/cli-test-xml/compare/virt-xml-build-disk-plain.xml
+++ b/tests/data/clitest/compare/virt-xml-build-disk-plain.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-build-idmap.xml b/tests/data/clitest/compare/virt-xml-build-idmap.xml
index e8f3317f..e8f3317f 100644
--- a/tests/cli-test-xml/compare/virt-xml-build-idmap.xml
+++ b/tests/data/clitest/compare/virt-xml-build-idmap.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-build-tpm.xml b/tests/data/clitest/compare/virt-xml-build-tpm.xml
index 3c4ce2a7..3c4ce2a7 100644
--- a/tests/cli-test-xml/compare/virt-xml-build-tpm.xml
+++ b/tests/data/clitest/compare/virt-xml-build-tpm.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-all.xml b/tests/data/clitest/compare/virt-xml-edit-all.xml
index ed09effc..ed09effc 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-all.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-all.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-bootorder.xml b/tests/data/clitest/compare/virt-xml-edit-bootorder.xml
index 0be579b4..0be579b4 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-bootorder.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-bootorder.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-clear-clock.xml b/tests/data/clitest/compare/virt-xml-edit-clear-clock.xml
index c08613bb..c08613bb 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-clear-clock.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-clear-clock.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-clear-cpu.xml b/tests/data/clitest/compare/virt-xml-edit-clear-cpu.xml
index 0afdc45c..0afdc45c 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-clear-cpu.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-clear-cpu.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-clear-disk.xml b/tests/data/clitest/compare/virt-xml-edit-clear-disk.xml
index d0d6c8b3..d0d6c8b3 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-clear-disk.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-clear-disk.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-clearxml-qemu-commandline.xml b/tests/data/clitest/compare/virt-xml-edit-clearxml-qemu-commandline.xml
index 354fe4af..354fe4af 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-clearxml-qemu-commandline.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-clearxml-qemu-commandline.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-disable-memballoon.xml b/tests/data/clitest/compare/virt-xml-edit-disable-memballoon.xml
index e40396c2..e40396c2 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-disable-memballoon.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-disable-memballoon.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-disk-unset.xml b/tests/data/clitest/compare/virt-xml-edit-disk-unset.xml
index 32d1d9c9..32d1d9c9 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-disk-unset.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-disk-unset.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-graphics-listen-none.xml b/tests/data/clitest/compare/virt-xml-edit-graphics-listen-none.xml
index 275f4759..275f4759 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-graphics-listen-none.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-graphics-listen-none.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml b/tests/data/clitest/compare/virt-xml-edit-graphics-spice-gl.xml
index 4656e313..4656e313 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-graphics-spice-gl.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-metadata-full-os.xml b/tests/data/clitest/compare/virt-xml-edit-metadata-full-os.xml
index 5fbd3e07..5fbd3e07 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-metadata-full-os.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-metadata-full-os.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml b/tests/data/clitest/compare/virt-xml-edit-neg-num.xml
index c38e3e76..c38e3e76 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-neg-num.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml b/tests/data/clitest/compare/virt-xml-edit-pos-num.xml
index 797ee720..797ee720 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-pos-num.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-bootorder.xml b/tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder.xml
index 60114b99..60114b99 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-bootorder.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-bootorder2.xml b/tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder2.xml
index 0c35cd14..0c35cd14 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-bootorder2.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder2.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-path.xml b/tests/data/clitest/compare/virt-xml-edit-select-disk-path.xml
index 51bf9366..51bf9366 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-path.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-select-disk-path.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-target.xml b/tests/data/clitest/compare/virt-xml-edit-select-disk-target.xml
index 680bf90e..680bf90e 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-target.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-select-disk-target.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-network-mac.xml b/tests/data/clitest/compare/virt-xml-edit-select-network-mac.xml
index 80443076..80443076 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-network-mac.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-select-network-mac.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml b/tests/data/clitest/compare/virt-xml-edit-select-sound-model.xml
index 797ee720..797ee720 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-select-sound-model.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-blkiotune.xml b/tests/data/clitest/compare/virt-xml-edit-simple-blkiotune.xml
index 88faf6d6..88faf6d6 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-blkiotune.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-blkiotune.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml b/tests/data/clitest/compare/virt-xml-edit-simple-boot.xml
index 142a8c0d..142a8c0d 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-boot.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-channel.xml b/tests/data/clitest/compare/virt-xml-edit-simple-channel.xml
index f0e55914..f0e55914 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-channel.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-channel.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-clock.xml b/tests/data/clitest/compare/virt-xml-edit-simple-clock.xml
index d660e7f6..d660e7f6 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-clock.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-clock.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml b/tests/data/clitest/compare/virt-xml-edit-simple-console.xml
index c6f04c13..c6f04c13 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-console.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-controller.xml b/tests/data/clitest/compare/virt-xml-edit-simple-controller.xml
index 12794d13..12794d13 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-controller.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-controller.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-cpu.xml b/tests/data/clitest/compare/virt-xml-edit-simple-cpu.xml
index ce67f937..ce67f937 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-cpu.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-cpu.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-disk-remove-path.xml b/tests/data/clitest/compare/virt-xml-edit-simple-disk-remove-path.xml
index b157b1d5..b157b1d5 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-disk-remove-path.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-disk-remove-path.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-disk.xml b/tests/data/clitest/compare/virt-xml-edit-simple-disk.xml
index 782b326d..782b326d 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-disk.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-disk.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml b/tests/data/clitest/compare/virt-xml-edit-simple-events.xml
index be2a4b66..be2a4b66 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-events.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-features.xml b/tests/data/clitest/compare/virt-xml-edit-simple-features.xml
index eebe96df..eebe96df 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-features.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-features.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-filesystem.xml b/tests/data/clitest/compare/virt-xml-edit-simple-filesystem.xml
index f7ccc6de..f7ccc6de 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-filesystem.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-filesystem.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml b/tests/data/clitest/compare/virt-xml-edit-simple-graphics.xml
index 22176d87..22176d87 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-graphics.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-host-device.xml b/tests/data/clitest/compare/virt-xml-edit-simple-host-device.xml
index 9359457d..9359457d 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-host-device.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-host-device.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml b/tests/data/clitest/compare/virt-xml-edit-simple-idmap.xml
index 42916bb8..42916bb8 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-idmap.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-memballoon.xml b/tests/data/clitest/compare/virt-xml-edit-simple-memballoon.xml
index e40396c2..e40396c2 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-memballoon.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-memballoon.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-memory.xml b/tests/data/clitest/compare/virt-xml-edit-simple-memory.xml
index 89902c4c..89902c4c 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-memory.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-memory.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-metadata.xml b/tests/data/clitest/compare/virt-xml-edit-simple-metadata.xml
index b40afcf2..b40afcf2 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-metadata.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-metadata.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-network.xml b/tests/data/clitest/compare/virt-xml-edit-simple-network.xml
index c24b5a04..c24b5a04 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-network.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-network.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-numatune.xml b/tests/data/clitest/compare/virt-xml-edit-simple-numatune.xml
index 9d63ca42..9d63ca42 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-numatune.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-numatune.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-parallel.xml b/tests/data/clitest/compare/virt-xml-edit-simple-parallel.xml
index 2648cc07..2648cc07 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-parallel.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-parallel.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml b/tests/data/clitest/compare/virt-xml-edit-simple-pm.xml
index 3df18a31..3df18a31 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-pm.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-qemu-commandline.xml b/tests/data/clitest/compare/virt-xml-edit-simple-qemu-commandline.xml
index ff00f1a2..ff00f1a2 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-qemu-commandline.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-qemu-commandline.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-redirdev.xml b/tests/data/clitest/compare/virt-xml-edit-simple-redirdev.xml
index 52ffddfe..52ffddfe 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-redirdev.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-redirdev.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-rng.xml b/tests/data/clitest/compare/virt-xml-edit-simple-rng.xml
index 8d24e544..8d24e544 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-rng.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-rng.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-security.xml b/tests/data/clitest/compare/virt-xml-edit-simple-security.xml
index d300f38b..d300f38b 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-security.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-security.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-serial.xml b/tests/data/clitest/compare/virt-xml-edit-simple-serial.xml
index cbf49e02..cbf49e02 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-serial.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-serial.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-smartcard.xml b/tests/data/clitest/compare/virt-xml-edit-simple-smartcard.xml
index 9eaf2377..9eaf2377 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-smartcard.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-smartcard.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml b/tests/data/clitest/compare/virt-xml-edit-simple-soundhw.xml
index 411e7918..411e7918 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-soundhw.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml b/tests/data/clitest/compare/virt-xml-edit-simple-tpm.xml
index 7cac1f45..7cac1f45 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-tpm.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-vcpus.xml b/tests/data/clitest/compare/virt-xml-edit-simple-vcpus.xml
index e4d88442..e4d88442 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-vcpus.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-vcpus.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml b/tests/data/clitest/compare/virt-xml-edit-simple-video.xml
index 6b7befca..6b7befca 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-video.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-vsock.xml b/tests/data/clitest/compare/virt-xml-edit-simple-vsock.xml
index 4fea668c..4fea668c 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-vsock.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-vsock.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-watchdog.xml b/tests/data/clitest/compare/virt-xml-edit-simple-watchdog.xml
index 314cbf3a..314cbf3a 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-watchdog.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-simple-watchdog.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-video-virtio.xml b/tests/data/clitest/compare/virt-xml-edit-video-virtio.xml
index 336df865..336df865 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-video-virtio.xml
+++ b/tests/data/clitest/compare/virt-xml-edit-video-virtio.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-hyperv-uefi-collision.xml b/tests/data/clitest/compare/virt-xml-hyperv-uefi-collision.xml
index 12607a14..12607a14 100644
--- a/tests/cli-test-xml/compare/virt-xml-hyperv-uefi-collision.xml
+++ b/tests/data/clitest/compare/virt-xml-hyperv-uefi-collision.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml b/tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml
index 515919b0..515919b0 100644
--- a/tests/cli-test-xml/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml
+++ b/tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-kvm-add-disk-os-from-xml.xml b/tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-xml.xml
index 4ee0f1cb..4ee0f1cb 100644
--- a/tests/cli-test-xml/compare/virt-xml-kvm-add-disk-os-from-xml.xml
+++ b/tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-xml.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-kvm-add-network-os-from-cmdline.xml b/tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-cmdline.xml
index 82644b32..82644b32 100644
--- a/tests/cli-test-xml/compare/virt-xml-kvm-add-network-os-from-cmdline.xml
+++ b/tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-cmdline.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-kvm-add-network-os-from-xml.xml b/tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-xml.xml
index b5e1146f..b5e1146f 100644
--- a/tests/cli-test-xml/compare/virt-xml-kvm-add-network-os-from-xml.xml
+++ b/tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-xml.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-print-xml.xml b/tests/data/clitest/compare/virt-xml-print-xml.xml
index 8b43832a..8b43832a 100644
--- a/tests/cli-test-xml/compare/virt-xml-print-xml.xml
+++ b/tests/data/clitest/compare/virt-xml-print-xml.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-prompt-response.xml b/tests/data/clitest/compare/virt-xml-prompt-response.xml
index 3eb4808e..3eb4808e 100644
--- a/tests/cli-test-xml/compare/virt-xml-prompt-response.xml
+++ b/tests/data/clitest/compare/virt-xml-prompt-response.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-disk-index.xml b/tests/data/clitest/compare/virt-xml-remove-disk-index.xml
index f0994381..f0994381 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-disk-index.xml
+++ b/tests/data/clitest/compare/virt-xml-remove-disk-index.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-disk-path-start.xml b/tests/data/clitest/compare/virt-xml-remove-disk-path-start.xml
index 06127f4b..06127f4b 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-disk-path-start.xml
+++ b/tests/data/clitest/compare/virt-xml-remove-disk-path-start.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-disk-path.xml b/tests/data/clitest/compare/virt-xml-remove-disk-path.xml
index a3313cb7..a3313cb7 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-disk-path.xml
+++ b/tests/data/clitest/compare/virt-xml-remove-disk-path.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-hostdev-name.xml b/tests/data/clitest/compare/virt-xml-remove-hostdev-name.xml
index f0c19062..f0c19062 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-hostdev-name.xml
+++ b/tests/data/clitest/compare/virt-xml-remove-hostdev-name.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-memballoon.xml b/tests/data/clitest/compare/virt-xml-remove-memballoon.xml
index 42ed467b..42ed467b 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-memballoon.xml
+++ b/tests/data/clitest/compare/virt-xml-remove-memballoon.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml b/tests/data/clitest/compare/virt-xml-remove-sound-model.xml
index d80497eb..d80497eb 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
+++ b/tests/data/clitest/compare/virt-xml-remove-sound-model.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml b/tests/data/clitest/compare/virt-xml-remove-video-all.xml
index 781531ee..781531ee 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml
+++ b/tests/data/clitest/compare/virt-xml-remove-video-all.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder.xml b/tests/data/clitest/compare/virt-xml-start-select-disk-bootorder.xml
index bd29f059..bd29f059 100644
--- a/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder.xml
+++ b/tests/data/clitest/compare/virt-xml-start-select-disk-bootorder.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder2.xml b/tests/data/clitest/compare/virt-xml-start-select-disk-bootorder2.xml
index 777044b2..777044b2 100644
--- a/tests/cli-test-xml/compare/virt-xml-start-select-disk-bootorder2.xml
+++ b/tests/data/clitest/compare/virt-xml-start-select-disk-bootorder2.xml
diff --git a/tests/cli-test-xml/compare/virt-xml-stdin-edit.xml b/tests/data/clitest/compare/virt-xml-stdin-edit.xml
index 834755f1..834755f1 100644
--- a/tests/cli-test-xml/compare/virt-xml-stdin-edit.xml
+++ b/tests/data/clitest/compare/virt-xml-stdin-edit.xml
diff --git a/tests/cli-test-xml/fake-centos65-label.iso b/tests/data/clitest/fake-centos65-label.iso
index c1899b2e..c1899b2e 100755
--- a/tests/cli-test-xml/fake-centos65-label.iso
+++ b/tests/data/clitest/fake-centos65-label.iso
diff --git a/tests/cli-test-xml/fake-f26-netinst.iso b/tests/data/clitest/fake-f26-netinst.iso
index 2d2b748f..2d2b748f 100755
--- a/tests/cli-test-xml/fake-f26-netinst.iso
+++ b/tests/data/clitest/fake-f26-netinst.iso
diff --git a/tests/cli-test-xml/fake-f29-live.iso b/tests/data/clitest/fake-f29-live.iso
index 71c27258..71c27258 100755
--- a/tests/cli-test-xml/fake-f29-live.iso
+++ b/tests/data/clitest/fake-f29-live.iso
diff --git a/tests/cli-test-xml/fake-fedora17-tree.iso b/tests/data/clitest/fake-fedora17-tree.iso
index 2e729a65..2e729a65 100755
--- a/tests/cli-test-xml/fake-fedora17-tree.iso
+++ b/tests/data/clitest/fake-fedora17-tree.iso
diff --git a/tests/cli-test-xml/fake-no-osinfo.iso b/tests/data/clitest/fake-no-osinfo.iso
index 4cf9c553..4cf9c553 100755
--- a/tests/cli-test-xml/fake-no-osinfo.iso
+++ b/tests/data/clitest/fake-no-osinfo.iso
diff --git a/tests/cli-test-xml/fake-win7.iso b/tests/data/clitest/fake-win7.iso
index 2bfe75cd..2bfe75cd 100755
--- a/tests/cli-test-xml/fake-win7.iso
+++ b/tests/data/clitest/fake-win7.iso
diff --git a/tests/cli-test-xml/fakefedoratree/.treeinfo b/tests/data/clitest/fakefedoratree/.treeinfo
index 9bbee18f..9bbee18f 100644
--- a/tests/cli-test-xml/fakefedoratree/.treeinfo
+++ b/tests/data/clitest/fakefedoratree/.treeinfo
diff --git a/tests/cli-test-xml/fakefedoratree/images/boot.iso b/tests/data/clitest/fakefedoratree/images/boot.iso
index 7fcf7ba3..7fcf7ba3 100644
--- a/tests/cli-test-xml/fakefedoratree/images/boot.iso
+++ b/tests/data/clitest/fakefedoratree/images/boot.iso
diff --git a/tests/cli-test-xml/fakefedoratree/images/pxeboot/initrd.img b/tests/data/clitest/fakefedoratree/images/pxeboot/initrd.img
index 0f3339f2..0f3339f2 100644
--- a/tests/cli-test-xml/fakefedoratree/images/pxeboot/initrd.img
+++ b/tests/data/clitest/fakefedoratree/images/pxeboot/initrd.img
diff --git a/tests/cli-test-xml/fakefedoratree/images/pxeboot/vmlinuz b/tests/data/clitest/fakefedoratree/images/pxeboot/vmlinuz
index fa797a2f..fa797a2f 100644
--- a/tests/cli-test-xml/fakefedoratree/images/pxeboot/vmlinuz
+++ b/tests/data/clitest/fakefedoratree/images/pxeboot/vmlinuz
diff --git a/tests/cli-test-xml/fakefedoratree/images/xen/initrd.img b/tests/data/clitest/fakefedoratree/images/xen/initrd.img
index 0f3339f2..0f3339f2 100644
--- a/tests/cli-test-xml/fakefedoratree/images/xen/initrd.img
+++ b/tests/data/clitest/fakefedoratree/images/xen/initrd.img
diff --git a/tests/cli-test-xml/fakefedoratree/images/xen/vmlinuz b/tests/data/clitest/fakefedoratree/images/xen/vmlinuz
index fa797a2f..fa797a2f 100644
--- a/tests/cli-test-xml/fakefedoratree/images/xen/vmlinuz
+++ b/tests/data/clitest/fakefedoratree/images/xen/vmlinuz
diff --git a/tests/cli-test-xml/fakerhel6tree/.treeinfo b/tests/data/clitest/fakerhel6tree/.treeinfo
index 8b328e73..8b328e73 100644
--- a/tests/cli-test-xml/fakerhel6tree/.treeinfo
+++ b/tests/data/clitest/fakerhel6tree/.treeinfo
diff --git a/tests/cli-test-xml/fakerhel6tree/images/boot.iso b/tests/data/clitest/fakerhel6tree/images/boot.iso
index 7fcf7ba3..7fcf7ba3 100644
--- a/tests/cli-test-xml/fakerhel6tree/images/boot.iso
+++ b/tests/data/clitest/fakerhel6tree/images/boot.iso
diff --git a/tests/cli-test-xml/fakerhel6tree/images/pxeboot/initrd.img b/tests/data/clitest/fakerhel6tree/images/pxeboot/initrd.img
index 0f3339f2..0f3339f2 100644
--- a/tests/cli-test-xml/fakerhel6tree/images/pxeboot/initrd.img
+++ b/tests/data/clitest/fakerhel6tree/images/pxeboot/initrd.img
diff --git a/tests/cli-test-xml/fakerhel6tree/images/pxeboot/vmlinuz b/tests/data/clitest/fakerhel6tree/images/pxeboot/vmlinuz
index fa797a2f..fa797a2f 100644
--- a/tests/cli-test-xml/fakerhel6tree/images/pxeboot/vmlinuz
+++ b/tests/data/clitest/fakerhel6tree/images/pxeboot/vmlinuz
diff --git a/tests/cli-test-xml/fakerhel6tree/images/xen/initrd.img b/tests/data/clitest/fakerhel6tree/images/xen/initrd.img
index 0f3339f2..0f3339f2 100644
--- a/tests/cli-test-xml/fakerhel6tree/images/xen/initrd.img
+++ b/tests/data/clitest/fakerhel6tree/images/xen/initrd.img
diff --git a/tests/cli-test-xml/fakerhel6tree/images/xen/vmlinuz b/tests/data/clitest/fakerhel6tree/images/xen/vmlinuz
index fa797a2f..fa797a2f 100644
--- a/tests/cli-test-xml/fakerhel6tree/images/xen/vmlinuz
+++ b/tests/data/clitest/fakerhel6tree/images/xen/vmlinuz
diff --git a/tests/cli-test-xml/testdriver-defaultpool-collision.xml b/tests/data/clitest/testdriver-defaultpool-collision.xml
index 1343f812..1343f812 100644
--- a/tests/cli-test-xml/testdriver-defaultpool-collision.xml
+++ b/tests/data/clitest/testdriver-defaultpool-collision.xml
diff --git a/tests/cli-test-xml/user-password.txt b/tests/data/clitest/user-password.txt
index 625999ba..625999ba 100644
--- a/tests/cli-test-xml/user-password.txt
+++ b/tests/data/clitest/user-password.txt
diff --git a/tests/cli-test-xml/virtxml-qemu-commandline-clear.xml b/tests/data/clitest/virtxml-qemu-commandline-clear.xml
index 40039412..40039412 100644
--- a/tests/cli-test-xml/virtxml-qemu-commandline-clear.xml
+++ b/tests/data/clitest/virtxml-qemu-commandline-clear.xml
diff --git a/tests/cli-test-xml/virtxml-stdin-edit.xml b/tests/data/clitest/virtxml-stdin-edit.xml
index 4a7b3e32..4a7b3e32 100644
--- a/tests/cli-test-xml/virtxml-stdin-edit.xml
+++ b/tests/data/clitest/virtxml-stdin-edit.xml
diff --git a/tests/clone-xml/channel-source-in.xml b/tests/data/clone/channel-source-in.xml
index f69054c4..f69054c4 100644
--- a/tests/clone-xml/channel-source-in.xml
+++ b/tests/data/clone/channel-source-in.xml
diff --git a/tests/clone-xml/channel-source-out.xml b/tests/data/clone/channel-source-out.xml
index 210e7a7b..210e7a7b 100644
--- a/tests/clone-xml/channel-source-out.xml
+++ b/tests/data/clone/channel-source-out.xml
diff --git a/tests/clone-xml/cross-pool-disks-out.xml b/tests/data/clone/cross-pool-disks-out.xml
index 260f321c..260f321c 100644
--- a/tests/clone-xml/cross-pool-disks-out.xml
+++ b/tests/data/clone/cross-pool-disks-out.xml
diff --git a/tests/clone-xml/cross-pool-in.xml b/tests/data/clone/cross-pool-in.xml
index 6177a6f9..6177a6f9 100644
--- a/tests/clone-xml/cross-pool-in.xml
+++ b/tests/data/clone/cross-pool-in.xml
diff --git a/tests/clone-xml/cross-pool-out.xml b/tests/data/clone/cross-pool-out.xml
index 5541adf7..5541adf7 100644
--- a/tests/clone-xml/cross-pool-out.xml
+++ b/tests/data/clone/cross-pool-out.xml
diff --git a/tests/clone-xml/empty-disks-in.xml b/tests/data/clone/empty-disks-in.xml
index a88c2666..a88c2666 100644
--- a/tests/clone-xml/empty-disks-in.xml
+++ b/tests/data/clone/empty-disks-in.xml
diff --git a/tests/clone-xml/empty-disks-out.xml b/tests/data/clone/empty-disks-out.xml
index 318f08d9..318f08d9 100644
--- a/tests/clone-xml/empty-disks-out.xml
+++ b/tests/data/clone/empty-disks-out.xml
diff --git a/tests/clone-xml/force-in.xml b/tests/data/clone/force-in.xml
index 1a431e8f..1a431e8f 100644
--- a/tests/clone-xml/force-in.xml
+++ b/tests/data/clone/force-in.xml
diff --git a/tests/clone-xml/force-out.xml b/tests/data/clone/force-out.xml
index 63bf6102..63bf6102 100644
--- a/tests/clone-xml/force-out.xml
+++ b/tests/data/clone/force-out.xml
diff --git a/tests/clone-xml/fullpool-in.xml b/tests/data/clone/fullpool-in.xml
index 9b5cc47a..9b5cc47a 100644
--- a/tests/clone-xml/fullpool-in.xml
+++ b/tests/data/clone/fullpool-in.xml
diff --git a/tests/clone-xml/general-cfg-in.xml b/tests/data/clone/general-cfg-in.xml
index c0a554ca..c0a554ca 100644
--- a/tests/clone-xml/general-cfg-in.xml
+++ b/tests/data/clone/general-cfg-in.xml
diff --git a/tests/clone-xml/general-cfg-out.xml b/tests/data/clone/general-cfg-out.xml
index 961d7aba..961d7aba 100644
--- a/tests/clone-xml/general-cfg-out.xml
+++ b/tests/data/clone/general-cfg-out.xml
diff --git a/tests/clone-xml/graphics-password-in.xml b/tests/data/clone/graphics-password-in.xml
index 13b14dd6..13b14dd6 100644
--- a/tests/clone-xml/graphics-password-in.xml
+++ b/tests/data/clone/graphics-password-in.xml
diff --git a/tests/clone-xml/graphics-password-out.xml b/tests/data/clone/graphics-password-out.xml
index e730efef..e730efef 100644
--- a/tests/clone-xml/graphics-password-out.xml
+++ b/tests/data/clone/graphics-password-out.xml
diff --git a/tests/clone-xml/managed-storage-in.xml b/tests/data/clone/managed-storage-in.xml
index 8cac51ee..8cac51ee 100644
--- a/tests/clone-xml/managed-storage-in.xml
+++ b/tests/data/clone/managed-storage-in.xml
diff --git a/tests/clone-xml/managed-storage-out.xml b/tests/data/clone/managed-storage-out.xml
index 540f8d7a..540f8d7a 100644
--- a/tests/clone-xml/managed-storage-out.xml
+++ b/tests/data/clone/managed-storage-out.xml
diff --git a/tests/clone-xml/noclone-storage-in.xml b/tests/data/clone/noclone-storage-in.xml
index 26303835..26303835 100644
--- a/tests/clone-xml/noclone-storage-in.xml
+++ b/tests/data/clone/noclone-storage-in.xml
diff --git a/tests/clone-xml/noclone-storage-out.xml b/tests/data/clone/noclone-storage-out.xml
index a76efba1..a76efba1 100644
--- a/tests/clone-xml/noclone-storage-out.xml
+++ b/tests/data/clone/noclone-storage-out.xml
diff --git a/tests/clone-xml/nostorage-in.xml b/tests/data/clone/nostorage-in.xml
index 72b97742..72b97742 100644
--- a/tests/clone-xml/nostorage-in.xml
+++ b/tests/data/clone/nostorage-in.xml
diff --git a/tests/clone-xml/nostorage-out.xml b/tests/data/clone/nostorage-out.xml
index 990a7712..990a7712 100644
--- a/tests/clone-xml/nostorage-out.xml
+++ b/tests/data/clone/nostorage-out.xml
diff --git a/tests/clone-xml/nvram-auto-in.xml b/tests/data/clone/nvram-auto-in.xml
index dc95f6ac..dc95f6ac 100644
--- a/tests/clone-xml/nvram-auto-in.xml
+++ b/tests/data/clone/nvram-auto-in.xml
diff --git a/tests/clone-xml/nvram-auto-out.xml b/tests/data/clone/nvram-auto-out.xml
index c59eaea8..c59eaea8 100644
--- a/tests/clone-xml/nvram-auto-out.xml
+++ b/tests/data/clone/nvram-auto-out.xml
diff --git a/tests/clone-xml/nvram-missing-in.xml b/tests/data/clone/nvram-missing-in.xml
index fcbce533..fcbce533 100644
--- a/tests/clone-xml/nvram-missing-in.xml
+++ b/tests/data/clone/nvram-missing-in.xml
diff --git a/tests/clone-xml/nvram-missing-out.xml b/tests/data/clone/nvram-missing-out.xml
index c59eaea8..c59eaea8 100644
--- a/tests/clone-xml/nvram-missing-out.xml
+++ b/tests/data/clone/nvram-missing-out.xml
diff --git a/tests/clone-xml/nvram-newpool-in.xml b/tests/data/clone/nvram-newpool-in.xml
index d27da472..d27da472 100644
--- a/tests/clone-xml/nvram-newpool-in.xml
+++ b/tests/data/clone/nvram-newpool-in.xml
diff --git a/tests/clone-xml/nvram-newpool-out.xml b/tests/data/clone/nvram-newpool-out.xml
index 42d95460..42d95460 100644
--- a/tests/clone-xml/nvram-newpool-out.xml
+++ b/tests/data/clone/nvram-newpool-out.xml
diff --git a/tests/clone-xml/readonly-disks-in.xml b/tests/data/clone/readonly-disks-in.xml
index c3962c9a..c3962c9a 100644
--- a/tests/clone-xml/readonly-disks-in.xml
+++ b/tests/data/clone/readonly-disks-in.xml
diff --git a/tests/clone-xml/readonly-disks-out.xml b/tests/data/clone/readonly-disks-out.xml
index 83e1b385..83e1b385 100644
--- a/tests/clone-xml/readonly-disks-out.xml
+++ b/tests/data/clone/readonly-disks-out.xml
diff --git a/tests/clone-xml/skip-in.xml b/tests/data/clone/skip-in.xml
index c04a6d6b..c04a6d6b 100644
--- a/tests/clone-xml/skip-in.xml
+++ b/tests/data/clone/skip-in.xml
diff --git a/tests/clone-xml/skip-out.xml b/tests/data/clone/skip-out.xml
index 01ba3e6f..01ba3e6f 100644
--- a/tests/clone-xml/skip-out.xml
+++ b/tests/data/clone/skip-out.xml
diff --git a/tests/codespell_dict.txt b/tests/data/codespell_dict.txt
index e64d127a..e64d127a 100644
--- a/tests/codespell_dict.txt
+++ b/tests/data/codespell_dict.txt
diff --git a/tests/inject-data/new-kickstart.ks b/tests/data/inject/new-kickstart.ks
index b68991c2..b68991c2 100644
--- a/tests/inject-data/new-kickstart.ks
+++ b/tests/data/inject/new-kickstart.ks
diff --git a/tests/inject-data/old-kickstart.ks b/tests/data/inject/old-kickstart.ks
index 0acf0bc0..0acf0bc0 100644
--- a/tests/inject-data/old-kickstart.ks
+++ b/tests/data/inject/old-kickstart.ks
diff --git a/tests/inject-data/preseed.cfg b/tests/data/inject/preseed.cfg
index 9ce133cd..9ce133cd 100644
--- a/tests/inject-data/preseed.cfg
+++ b/tests/data/inject/preseed.cfg
diff --git a/tests/nodedev-xml/devxml/pcidev.xml b/tests/data/nodedev/devxml/pcidev.xml
index dca82993..dca82993 100644
--- a/tests/nodedev-xml/devxml/pcidev.xml
+++ b/tests/data/nodedev/devxml/pcidev.xml
diff --git a/tests/nodedev-xml/devxml/usbdev1.xml b/tests/data/nodedev/devxml/usbdev1.xml
index 44712453..44712453 100644
--- a/tests/nodedev-xml/devxml/usbdev1.xml
+++ b/tests/data/nodedev/devxml/usbdev1.xml
diff --git a/tests/nodedev-xml/devxml/usbdev2.xml b/tests/data/nodedev/devxml/usbdev2.xml
index e648c206..e648c206 100644
--- a/tests/nodedev-xml/devxml/usbdev2.xml
+++ b/tests/data/nodedev/devxml/usbdev2.xml
diff --git a/tests/storage-xml/pool-dir-vol.xml b/tests/data/storage/pool-dir-vol.xml
index e6d5a691..e6d5a691 100644
--- a/tests/storage-xml/pool-dir-vol.xml
+++ b/tests/data/storage/pool-dir-vol.xml
diff --git a/tests/storage-xml/pool-dir-volclone.xml b/tests/data/storage/pool-dir-volclone.xml
index c8bde66f..c8bde66f 100644
--- a/tests/storage-xml/pool-dir-volclone.xml
+++ b/tests/data/storage/pool-dir-volclone.xml
diff --git a/tests/storage-xml/pool-dir-volinput.xml b/tests/data/storage/pool-dir-volinput.xml
index e8e3018e..e8e3018e 100644
--- a/tests/storage-xml/pool-dir-volinput.xml
+++ b/tests/data/storage/pool-dir-volinput.xml
diff --git a/tests/storage-xml/pool-dir.xml b/tests/data/storage/pool-dir.xml
index 18e92250..18e92250 100644
--- a/tests/storage-xml/pool-dir.xml
+++ b/tests/data/storage/pool-dir.xml
diff --git a/tests/storage-xml/pool-disk-vol.xml b/tests/data/storage/pool-disk-vol.xml
index f96726ff..f96726ff 100644
--- a/tests/storage-xml/pool-disk-vol.xml
+++ b/tests/data/storage/pool-disk-vol.xml
diff --git a/tests/storage-xml/pool-disk-volclone.xml b/tests/data/storage/pool-disk-volclone.xml
index a4e9c3d1..a4e9c3d1 100644
--- a/tests/storage-xml/pool-disk-volclone.xml
+++ b/tests/data/storage/pool-disk-volclone.xml
diff --git a/tests/storage-xml/pool-disk-volinput.xml b/tests/data/storage/pool-disk-volinput.xml
index f769691a..f769691a 100644
--- a/tests/storage-xml/pool-disk-volinput.xml
+++ b/tests/data/storage/pool-disk-volinput.xml
diff --git a/tests/storage-xml/pool-disk.xml b/tests/data/storage/pool-disk.xml
index a0a15339..a0a15339 100644
--- a/tests/storage-xml/pool-disk.xml
+++ b/tests/data/storage/pool-disk.xml
diff --git a/tests/storage-xml/pool-fs-vol.xml b/tests/data/storage/pool-fs-vol.xml
index 01c67371..01c67371 100644
--- a/tests/storage-xml/pool-fs-vol.xml
+++ b/tests/data/storage/pool-fs-vol.xml
diff --git a/tests/storage-xml/pool-fs-volclone.xml b/tests/data/storage/pool-fs-volclone.xml
index 34e8cd08..34e8cd08 100644
--- a/tests/storage-xml/pool-fs-volclone.xml
+++ b/tests/data/storage/pool-fs-volclone.xml
diff --git a/tests/storage-xml/pool-fs-volinput.xml b/tests/data/storage/pool-fs-volinput.xml
index eb0f0993..eb0f0993 100644
--- a/tests/storage-xml/pool-fs-volinput.xml
+++ b/tests/data/storage/pool-fs-volinput.xml
diff --git a/tests/storage-xml/pool-fs.xml b/tests/data/storage/pool-fs.xml
index 57e1c673..57e1c673 100644
--- a/tests/storage-xml/pool-fs.xml
+++ b/tests/data/storage/pool-fs.xml
diff --git a/tests/storage-xml/pool-gluster.xml b/tests/data/storage/pool-gluster.xml
index abe813d0..abe813d0 100644
--- a/tests/storage-xml/pool-gluster.xml
+++ b/tests/data/storage/pool-gluster.xml
diff --git a/tests/storage-xml/pool-iscsi.xml b/tests/data/storage/pool-iscsi.xml
index 7ef81f0a..7ef81f0a 100644
--- a/tests/storage-xml/pool-iscsi.xml
+++ b/tests/data/storage/pool-iscsi.xml
diff --git a/tests/storage-xml/pool-logical-srcname.xml b/tests/data/storage/pool-logical-srcname.xml
index 8b7ff653..8b7ff653 100644
--- a/tests/storage-xml/pool-logical-srcname.xml
+++ b/tests/data/storage/pool-logical-srcname.xml
diff --git a/tests/storage-xml/pool-logical-target-srcname.xml b/tests/data/storage/pool-logical-target-srcname.xml
index 91664dc2..91664dc2 100644
--- a/tests/storage-xml/pool-logical-target-srcname.xml
+++ b/tests/data/storage/pool-logical-target-srcname.xml
diff --git a/tests/storage-xml/pool-logical-vol.xml b/tests/data/storage/pool-logical-vol.xml
index aaca040f..aaca040f 100644
--- a/tests/storage-xml/pool-logical-vol.xml
+++ b/tests/data/storage/pool-logical-vol.xml
diff --git a/tests/storage-xml/pool-logical-volclone.xml b/tests/data/storage/pool-logical-volclone.xml
index c012017e..c012017e 100644
--- a/tests/storage-xml/pool-logical-volclone.xml
+++ b/tests/data/storage/pool-logical-volclone.xml
diff --git a/tests/storage-xml/pool-logical-volinput.xml b/tests/data/storage/pool-logical-volinput.xml
index d51a9b06..d51a9b06 100644
--- a/tests/storage-xml/pool-logical-volinput.xml
+++ b/tests/data/storage/pool-logical-volinput.xml
diff --git a/tests/storage-xml/pool-logical.xml b/tests/data/storage/pool-logical.xml
index 0f4453bd..0f4453bd 100644
--- a/tests/storage-xml/pool-logical.xml
+++ b/tests/data/storage/pool-logical.xml
diff --git a/tests/storage-xml/pool-mpath.xml b/tests/data/storage/pool-mpath.xml
index 9aa8d369..9aa8d369 100644
--- a/tests/storage-xml/pool-mpath.xml
+++ b/tests/data/storage/pool-mpath.xml
diff --git a/tests/storage-xml/pool-netfs-vol.xml b/tests/data/storage/pool-netfs-vol.xml
index c87db9fe..c87db9fe 100644
--- a/tests/storage-xml/pool-netfs-vol.xml
+++ b/tests/data/storage/pool-netfs-vol.xml
diff --git a/tests/storage-xml/pool-netfs-volclone.xml b/tests/data/storage/pool-netfs-volclone.xml
index b6b39f79..b6b39f79 100644
--- a/tests/storage-xml/pool-netfs-volclone.xml
+++ b/tests/data/storage/pool-netfs-volclone.xml
diff --git a/tests/storage-xml/pool-netfs-volinput.xml b/tests/data/storage/pool-netfs-volinput.xml
index ee1654f7..ee1654f7 100644
--- a/tests/storage-xml/pool-netfs-volinput.xml
+++ b/tests/data/storage/pool-netfs-volinput.xml
diff --git a/tests/storage-xml/pool-netfs.xml b/tests/data/storage/pool-netfs.xml
index cd7e1c99..cd7e1c99 100644
--- a/tests/storage-xml/pool-netfs.xml
+++ b/tests/data/storage/pool-netfs.xml
diff --git a/tests/storage-xml/pool-rbd.xml b/tests/data/storage/pool-rbd.xml
index cc463a1f..cc463a1f 100644
--- a/tests/storage-xml/pool-rbd.xml
+++ b/tests/data/storage/pool-rbd.xml
diff --git a/tests/storage-xml/pool-scsi.xml b/tests/data/storage/pool-scsi.xml
index 846c08e9..846c08e9 100644
--- a/tests/storage-xml/pool-scsi.xml
+++ b/tests/data/storage/pool-scsi.xml
diff --git a/tests/test_urls.ini b/tests/data/test_urls.ini
index dc3e148b..dc3e148b 100644
--- a/tests/test_urls.ini
+++ b/tests/data/test_urls.ini
diff --git a/tests/xmlconfig-xml/install-f11-rheldefaults.xml b/tests/data/xmlconfig/install-f11-rheldefaults.xml
index 125bbd37..125bbd37 100644
--- a/tests/xmlconfig-xml/install-f11-rheldefaults.xml
+++ b/tests/data/xmlconfig/install-f11-rheldefaults.xml
diff --git a/tests/xmlconfig-xml/install-no-virtionet-xen.xml b/tests/data/xmlconfig/install-no-virtionet-xen.xml
index c6ac58e4..c6ac58e4 100644
--- a/tests/xmlconfig-xml/install-no-virtionet-xen.xml
+++ b/tests/data/xmlconfig/install-no-virtionet-xen.xml
diff --git a/tests/xmlparse-xml/add-devices-in.xml b/tests/data/xmlparse/add-devices-in.xml
index 9534e936..9534e936 100644
--- a/tests/xmlparse-xml/add-devices-in.xml
+++ b/tests/data/xmlparse/add-devices-in.xml
diff --git a/tests/xmlparse-xml/add-devices-out.xml b/tests/data/xmlparse/add-devices-out.xml
index 69efed18..69efed18 100644
--- a/tests/xmlparse-xml/add-devices-out.xml
+++ b/tests/data/xmlparse/add-devices-out.xml
diff --git a/tests/xmlparse-xml/change-addr-in.xml b/tests/data/xmlparse/change-addr-in.xml
index d1e2ac70..d1e2ac70 100644
--- a/tests/xmlparse-xml/change-addr-in.xml
+++ b/tests/data/xmlparse/change-addr-in.xml
diff --git a/tests/xmlparse-xml/change-addr-out.xml b/tests/data/xmlparse/change-addr-out.xml
index 81e0e47e..81e0e47e 100644
--- a/tests/xmlparse-xml/change-addr-out.xml
+++ b/tests/data/xmlparse/change-addr-out.xml
diff --git a/tests/xmlparse-xml/change-boot-kernel-in.xml b/tests/data/xmlparse/change-boot-kernel-in.xml
index ffbc280e..ffbc280e 100644
--- a/tests/xmlparse-xml/change-boot-kernel-in.xml
+++ b/tests/data/xmlparse/change-boot-kernel-in.xml
diff --git a/tests/xmlparse-xml/change-boot-kernel-out.xml b/tests/data/xmlparse/change-boot-kernel-out.xml
index b66c708d..b66c708d 100644
--- a/tests/xmlparse-xml/change-boot-kernel-out.xml
+++ b/tests/data/xmlparse/change-boot-kernel-out.xml
diff --git a/tests/xmlparse-xml/change-boot-multi-in.xml b/tests/data/xmlparse/change-boot-multi-in.xml
index 6ce7bfe1..6ce7bfe1 100644
--- a/tests/xmlparse-xml/change-boot-multi-in.xml
+++ b/tests/data/xmlparse/change-boot-multi-in.xml
diff --git a/tests/xmlparse-xml/change-boot-multi-out.xml b/tests/data/xmlparse/change-boot-multi-out.xml
index e9ad5666..e9ad5666 100644
--- a/tests/xmlparse-xml/change-boot-multi-out.xml
+++ b/tests/data/xmlparse/change-boot-multi-out.xml
diff --git a/tests/xmlparse-xml/change-boot-uefi-in.xml b/tests/data/xmlparse/change-boot-uefi-in.xml
index ffbc280e..ffbc280e 100644
--- a/tests/xmlparse-xml/change-boot-uefi-in.xml
+++ b/tests/data/xmlparse/change-boot-uefi-in.xml
diff --git a/tests/xmlparse-xml/change-boot-uefi-out.xml b/tests/data/xmlparse/change-boot-uefi-out.xml
index 77ff454d..77ff454d 100644
--- a/tests/xmlparse-xml/change-boot-uefi-out.xml
+++ b/tests/data/xmlparse/change-boot-uefi-out.xml
diff --git a/tests/xmlparse-xml/change-chars-in.xml b/tests/data/xmlparse/change-chars-in.xml
index 98d71627..98d71627 100644
--- a/tests/xmlparse-xml/change-chars-in.xml
+++ b/tests/data/xmlparse/change-chars-in.xml
diff --git a/tests/xmlparse-xml/change-chars-out.xml b/tests/data/xmlparse/change-chars-out.xml
index 95b69a30..95b69a30 100644
--- a/tests/xmlparse-xml/change-chars-out.xml
+++ b/tests/data/xmlparse/change-chars-out.xml
diff --git a/tests/xmlparse-xml/change-controllers-in.xml b/tests/data/xmlparse/change-controllers-in.xml
index 4fe1c1c8..4fe1c1c8 100644
--- a/tests/xmlparse-xml/change-controllers-in.xml
+++ b/tests/data/xmlparse/change-controllers-in.xml
diff --git a/tests/xmlparse-xml/change-controllers-out.xml b/tests/data/xmlparse/change-controllers-out.xml
index 64d45411..64d45411 100644
--- a/tests/xmlparse-xml/change-controllers-out.xml
+++ b/tests/data/xmlparse/change-controllers-out.xml
diff --git a/tests/xmlparse-xml/change-cpumode-in.xml b/tests/data/xmlparse/change-cpumode-in.xml
index efe15f7b..efe15f7b 100644
--- a/tests/xmlparse-xml/change-cpumode-in.xml
+++ b/tests/data/xmlparse/change-cpumode-in.xml
diff --git a/tests/xmlparse-xml/change-cpumode-out.xml b/tests/data/xmlparse/change-cpumode-out.xml
index 23cc3e3c..23cc3e3c 100644
--- a/tests/xmlparse-xml/change-cpumode-out.xml
+++ b/tests/data/xmlparse/change-cpumode-out.xml
diff --git a/tests/xmlparse-xml/change-devices-bootorder-fixed-out.xml b/tests/data/xmlparse/change-devices-bootorder-fixed-out.xml
index e8fa6975..e8fa6975 100644
--- a/tests/xmlparse-xml/change-devices-bootorder-fixed-out.xml
+++ b/tests/data/xmlparse/change-devices-bootorder-fixed-out.xml
diff --git a/tests/xmlparse-xml/change-devices-bootorder-in.xml b/tests/data/xmlparse/change-devices-bootorder-in.xml
index 66dd57a8..66dd57a8 100644
--- a/tests/xmlparse-xml/change-devices-bootorder-in.xml
+++ b/tests/data/xmlparse/change-devices-bootorder-in.xml
diff --git a/tests/xmlparse-xml/change-devices-bootorder-out.xml b/tests/data/xmlparse/change-devices-bootorder-out.xml
index f03bc591..f03bc591 100644
--- a/tests/xmlparse-xml/change-devices-bootorder-out.xml
+++ b/tests/data/xmlparse/change-devices-bootorder-out.xml
diff --git a/tests/xmlparse-xml/change-disk-in.xml b/tests/data/xmlparse/change-disk-in.xml
index adba6146..adba6146 100644
--- a/tests/xmlparse-xml/change-disk-in.xml
+++ b/tests/data/xmlparse/change-disk-in.xml
diff --git a/tests/xmlparse-xml/change-disk-out.xml b/tests/data/xmlparse/change-disk-out.xml
index f65a1bc4..f65a1bc4 100644
--- a/tests/xmlparse-xml/change-disk-out.xml
+++ b/tests/data/xmlparse/change-disk-out.xml
diff --git a/tests/xmlparse-xml/change-filesystems-in.xml b/tests/data/xmlparse/change-filesystems-in.xml
index e622b967..e622b967 100644
--- a/tests/xmlparse-xml/change-filesystems-in.xml
+++ b/tests/data/xmlparse/change-filesystems-in.xml
diff --git a/tests/xmlparse-xml/change-filesystems-out.xml b/tests/data/xmlparse/change-filesystems-out.xml
index 0c890847..0c890847 100644
--- a/tests/xmlparse-xml/change-filesystems-out.xml
+++ b/tests/data/xmlparse/change-filesystems-out.xml
diff --git a/tests/xmlparse-xml/change-graphics-in.xml b/tests/data/xmlparse/change-graphics-in.xml
index 28c243b5..28c243b5 100644
--- a/tests/xmlparse-xml/change-graphics-in.xml
+++ b/tests/data/xmlparse/change-graphics-in.xml
diff --git a/tests/xmlparse-xml/change-graphics-out.xml b/tests/data/xmlparse/change-graphics-out.xml
index 6aea45b6..6aea45b6 100644
--- a/tests/xmlparse-xml/change-graphics-out.xml
+++ b/tests/data/xmlparse/change-graphics-out.xml
diff --git a/tests/xmlparse-xml/change-guest-in.xml b/tests/data/xmlparse/change-guest-in.xml
index 4c441d7e..4c441d7e 100644
--- a/tests/xmlparse-xml/change-guest-in.xml
+++ b/tests/data/xmlparse/change-guest-in.xml
diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/data/xmlparse/change-guest-out.xml
index 17af0826..17af0826 100644
--- a/tests/xmlparse-xml/change-guest-out.xml
+++ b/tests/data/xmlparse/change-guest-out.xml
diff --git a/tests/xmlparse-xml/change-hostdevs-in.xml b/tests/data/xmlparse/change-hostdevs-in.xml
index ed173a6a..ed173a6a 100644
--- a/tests/xmlparse-xml/change-hostdevs-in.xml
+++ b/tests/data/xmlparse/change-hostdevs-in.xml
diff --git a/tests/xmlparse-xml/change-hostdevs-out.xml b/tests/data/xmlparse/change-hostdevs-out.xml
index 7c1fe64a..7c1fe64a 100644
--- a/tests/xmlparse-xml/change-hostdevs-out.xml
+++ b/tests/data/xmlparse/change-hostdevs-out.xml
diff --git a/tests/xmlparse-xml/change-inputs-in.xml b/tests/data/xmlparse/change-inputs-in.xml
index 94a357c1..94a357c1 100644
--- a/tests/xmlparse-xml/change-inputs-in.xml
+++ b/tests/data/xmlparse/change-inputs-in.xml
diff --git a/tests/xmlparse-xml/change-inputs-out.xml b/tests/data/xmlparse/change-inputs-out.xml
index d64d7102..d64d7102 100644
--- a/tests/xmlparse-xml/change-inputs-out.xml
+++ b/tests/data/xmlparse/change-inputs-out.xml
diff --git a/tests/xmlparse-xml/change-media-in.xml b/tests/data/xmlparse/change-media-in.xml
index e763632b..e763632b 100644
--- a/tests/xmlparse-xml/change-media-in.xml
+++ b/tests/data/xmlparse/change-media-in.xml
diff --git a/tests/xmlparse-xml/change-media-out.xml b/tests/data/xmlparse/change-media-out.xml
index 3849d6bb..3849d6bb 100644
--- a/tests/xmlparse-xml/change-media-out.xml
+++ b/tests/data/xmlparse/change-media-out.xml
diff --git a/tests/xmlparse-xml/change-minimal-guest-in.xml b/tests/data/xmlparse/change-minimal-guest-in.xml
index 01575435..01575435 100644
--- a/tests/xmlparse-xml/change-minimal-guest-in.xml
+++ b/tests/data/xmlparse/change-minimal-guest-in.xml
diff --git a/tests/xmlparse-xml/change-minimal-guest-out.xml b/tests/data/xmlparse/change-minimal-guest-out.xml
index d347eec0..d347eec0 100644
--- a/tests/xmlparse-xml/change-minimal-guest-out.xml
+++ b/tests/data/xmlparse/change-minimal-guest-out.xml
diff --git a/tests/xmlparse-xml/change-nics-in.xml b/tests/data/xmlparse/change-nics-in.xml
index f27ae042..f27ae042 100644
--- a/tests/xmlparse-xml/change-nics-in.xml
+++ b/tests/data/xmlparse/change-nics-in.xml
diff --git a/tests/xmlparse-xml/change-nics-out.xml b/tests/data/xmlparse/change-nics-out.xml
index 85651ca7..85651ca7 100644
--- a/tests/xmlparse-xml/change-nics-out.xml
+++ b/tests/data/xmlparse/change-nics-out.xml
diff --git a/tests/xmlparse-xml/change-panic-device-in.xml b/tests/data/xmlparse/change-panic-device-in.xml
index a18c5d81..a18c5d81 100644
--- a/tests/xmlparse-xml/change-panic-device-in.xml
+++ b/tests/data/xmlparse/change-panic-device-in.xml
diff --git a/tests/xmlparse-xml/change-panic-device-out.xml b/tests/data/xmlparse/change-panic-device-out.xml
index ac94f5b7..ac94f5b7 100644
--- a/tests/xmlparse-xml/change-panic-device-out.xml
+++ b/tests/data/xmlparse/change-panic-device-out.xml
diff --git a/tests/xmlparse-xml/change-redirdev-in.xml b/tests/data/xmlparse/change-redirdev-in.xml
index 4922466c..4922466c 100644
--- a/tests/xmlparse-xml/change-redirdev-in.xml
+++ b/tests/data/xmlparse/change-redirdev-in.xml
diff --git a/tests/xmlparse-xml/change-redirdev-out.xml b/tests/data/xmlparse/change-redirdev-out.xml
index 355db527..355db527 100644
--- a/tests/xmlparse-xml/change-redirdev-out.xml
+++ b/tests/data/xmlparse/change-redirdev-out.xml
diff --git a/tests/xmlparse-xml/change-rng-egd-in.xml b/tests/data/xmlparse/change-rng-egd-in.xml
index d92743b7..d92743b7 100644
--- a/tests/xmlparse-xml/change-rng-egd-in.xml
+++ b/tests/data/xmlparse/change-rng-egd-in.xml
diff --git a/tests/xmlparse-xml/change-rng-egd-out.xml b/tests/data/xmlparse/change-rng-egd-out.xml
index 30df6bdb..30df6bdb 100644
--- a/tests/xmlparse-xml/change-rng-egd-out.xml
+++ b/tests/data/xmlparse/change-rng-egd-out.xml
diff --git a/tests/xmlparse-xml/change-rng-random-in.xml b/tests/data/xmlparse/change-rng-random-in.xml
index 22d3ed3e..22d3ed3e 100644
--- a/tests/xmlparse-xml/change-rng-random-in.xml
+++ b/tests/data/xmlparse/change-rng-random-in.xml
diff --git a/tests/xmlparse-xml/change-rng-random-out.xml b/tests/data/xmlparse/change-rng-random-out.xml
index 018b5176..018b5176 100644
--- a/tests/xmlparse-xml/change-rng-random-out.xml
+++ b/tests/data/xmlparse/change-rng-random-out.xml
diff --git a/tests/xmlparse-xml/change-seclabel-in.xml b/tests/data/xmlparse/change-seclabel-in.xml
index 8e16ecb2..8e16ecb2 100644
--- a/tests/xmlparse-xml/change-seclabel-in.xml
+++ b/tests/data/xmlparse/change-seclabel-in.xml
diff --git a/tests/xmlparse-xml/change-seclabel-out.xml b/tests/data/xmlparse/change-seclabel-out.xml
index 436fd7f4..436fd7f4 100644
--- a/tests/xmlparse-xml/change-seclabel-out.xml
+++ b/tests/data/xmlparse/change-seclabel-out.xml
diff --git a/tests/xmlparse-xml/change-smartcard-in.xml b/tests/data/xmlparse/change-smartcard-in.xml
index d36d85e3..d36d85e3 100644
--- a/tests/xmlparse-xml/change-smartcard-in.xml
+++ b/tests/data/xmlparse/change-smartcard-in.xml
diff --git a/tests/xmlparse-xml/change-smartcard-out.xml b/tests/data/xmlparse/change-smartcard-out.xml
index 712cc4b5..712cc4b5 100644
--- a/tests/xmlparse-xml/change-smartcard-out.xml
+++ b/tests/data/xmlparse/change-smartcard-out.xml
diff --git a/tests/xmlparse-xml/change-snapshot-in.xml b/tests/data/xmlparse/change-snapshot-in.xml
index 5574c5d1..5574c5d1 100644
--- a/tests/xmlparse-xml/change-snapshot-in.xml
+++ b/tests/data/xmlparse/change-snapshot-in.xml
diff --git a/tests/xmlparse-xml/change-snapshot-out.xml b/tests/data/xmlparse/change-snapshot-out.xml
index 124c698e..124c698e 100644
--- a/tests/xmlparse-xml/change-snapshot-out.xml
+++ b/tests/data/xmlparse/change-snapshot-out.xml
diff --git a/tests/xmlparse-xml/change-sounds-in.xml b/tests/data/xmlparse/change-sounds-in.xml
index 88c77d4b..88c77d4b 100644
--- a/tests/xmlparse-xml/change-sounds-in.xml
+++ b/tests/data/xmlparse/change-sounds-in.xml
diff --git a/tests/xmlparse-xml/change-sounds-out.xml b/tests/data/xmlparse/change-sounds-out.xml
index abc1ea98..abc1ea98 100644
--- a/tests/xmlparse-xml/change-sounds-out.xml
+++ b/tests/data/xmlparse/change-sounds-out.xml
diff --git a/tests/xmlparse-xml/change-tpm-in.xml b/tests/data/xmlparse/change-tpm-in.xml
index 82246edd..82246edd 100644
--- a/tests/xmlparse-xml/change-tpm-in.xml
+++ b/tests/data/xmlparse/change-tpm-in.xml
diff --git a/tests/xmlparse-xml/change-tpm-out.xml b/tests/data/xmlparse/change-tpm-out.xml
index 47d0dfdc..47d0dfdc 100644
--- a/tests/xmlparse-xml/change-tpm-out.xml
+++ b/tests/data/xmlparse/change-tpm-out.xml
diff --git a/tests/xmlparse-xml/change-videos-in.xml b/tests/data/xmlparse/change-videos-in.xml
index f1f5bff0..f1f5bff0 100644
--- a/tests/xmlparse-xml/change-videos-in.xml
+++ b/tests/data/xmlparse/change-videos-in.xml
diff --git a/tests/xmlparse-xml/change-videos-out.xml b/tests/data/xmlparse/change-videos-out.xml
index ab8c0260..ab8c0260 100644
--- a/tests/xmlparse-xml/change-videos-out.xml
+++ b/tests/data/xmlparse/change-videos-out.xml
diff --git a/tests/xmlparse-xml/change-watchdogs-in.xml b/tests/data/xmlparse/change-watchdogs-in.xml
index 7bd6738c..7bd6738c 100644
--- a/tests/xmlparse-xml/change-watchdogs-in.xml
+++ b/tests/data/xmlparse/change-watchdogs-in.xml
diff --git a/tests/xmlparse-xml/change-watchdogs-out.xml b/tests/data/xmlparse/change-watchdogs-out.xml
index 8e8021ea..8e8021ea 100644
--- a/tests/xmlparse-xml/change-watchdogs-out.xml
+++ b/tests/data/xmlparse/change-watchdogs-out.xml
diff --git a/tests/xmlparse-xml/change-xmlns-qemu-in.xml b/tests/data/xmlparse/change-xmlns-qemu-in.xml
index 926abbc7..926abbc7 100644
--- a/tests/xmlparse-xml/change-xmlns-qemu-in.xml
+++ b/tests/data/xmlparse/change-xmlns-qemu-in.xml
diff --git a/tests/xmlparse-xml/change-xmlns-qemu-out.xml b/tests/data/xmlparse/change-xmlns-qemu-out.xml
index 6ccb2b11..6ccb2b11 100644
--- a/tests/xmlparse-xml/change-xmlns-qemu-out.xml
+++ b/tests/data/xmlparse/change-xmlns-qemu-out.xml
diff --git a/tests/xmlparse-xml/clear-cpu-unknown-vals-in.xml b/tests/data/xmlparse/clear-cpu-unknown-vals-in.xml
index 26434081..26434081 100644
--- a/tests/xmlparse-xml/clear-cpu-unknown-vals-in.xml
+++ b/tests/data/xmlparse/clear-cpu-unknown-vals-in.xml
diff --git a/tests/xmlparse-xml/clear-cpu-unknown-vals-out.xml b/tests/data/xmlparse/clear-cpu-unknown-vals-out.xml
index 50c06b8f..50c06b8f 100644
--- a/tests/xmlparse-xml/clear-cpu-unknown-vals-out.xml
+++ b/tests/data/xmlparse/clear-cpu-unknown-vals-out.xml
diff --git a/tests/xmlparse-xml/domain-roundtrip.xml b/tests/data/xmlparse/domain-roundtrip.xml
index 0190c440..0190c440 100644
--- a/tests/xmlparse-xml/domain-roundtrip.xml
+++ b/tests/data/xmlparse/domain-roundtrip.xml
diff --git a/tests/xmlparse-xml/interface-test-bond-arp-out.xml b/tests/data/xmlparse/interface-test-bond-arp-out.xml
index aee2b6bb..aee2b6bb 100644
--- a/tests/xmlparse-xml/interface-test-bond-arp-out.xml
+++ b/tests/data/xmlparse/interface-test-bond-arp-out.xml
diff --git a/tests/xmlparse-xml/interface-test-bond-mii-out.xml b/tests/data/xmlparse/interface-test-bond-mii-out.xml
index 5b0a77e6..5b0a77e6 100644
--- a/tests/xmlparse-xml/interface-test-bond-mii-out.xml
+++ b/tests/data/xmlparse/interface-test-bond-mii-out.xml
diff --git a/tests/xmlparse-xml/interface-test-bridge-ip-out.xml b/tests/data/xmlparse/interface-test-bridge-ip-out.xml
index 49e0510f..49e0510f 100644
--- a/tests/xmlparse-xml/interface-test-bridge-ip-out.xml
+++ b/tests/data/xmlparse/interface-test-bridge-ip-out.xml
diff --git a/tests/xmlparse-xml/interface-test-vlan-out.xml b/tests/data/xmlparse/interface-test-vlan-out.xml
index 7a873157..7a873157 100644
--- a/tests/xmlparse-xml/interface-test-vlan-out.xml
+++ b/tests/data/xmlparse/interface-test-vlan-out.xml
diff --git a/tests/xmlparse-xml/network-multi-in.xml b/tests/data/xmlparse/network-multi-in.xml
index f289c0ca..f289c0ca 100644
--- a/tests/xmlparse-xml/network-multi-in.xml
+++ b/tests/data/xmlparse/network-multi-in.xml
diff --git a/tests/xmlparse-xml/network-multi-out.xml b/tests/data/xmlparse/network-multi-out.xml
index 3a31a151..3a31a151 100644
--- a/tests/xmlparse-xml/network-multi-out.xml
+++ b/tests/data/xmlparse/network-multi-out.xml
diff --git a/tests/xmlparse-xml/network-open-in.xml b/tests/data/xmlparse/network-open-in.xml
index bd394eec..bd394eec 100644
--- a/tests/xmlparse-xml/network-open-in.xml
+++ b/tests/data/xmlparse/network-open-in.xml
diff --git a/tests/xmlparse-xml/network-open-out.xml b/tests/data/xmlparse/network-open-out.xml
index 22c13b6e..22c13b6e 100644
--- a/tests/xmlparse-xml/network-open-out.xml
+++ b/tests/data/xmlparse/network-open-out.xml
diff --git a/tests/xmlparse-xml/network-vf-pool-in.xml b/tests/data/xmlparse/network-vf-pool-in.xml
index 4acede0a..4acede0a 100644
--- a/tests/xmlparse-xml/network-vf-pool-in.xml
+++ b/tests/data/xmlparse/network-vf-pool-in.xml
diff --git a/tests/xmlparse-xml/network-vf-pool-out.xml b/tests/data/xmlparse/network-vf-pool-out.xml
index 62a73050..62a73050 100644
--- a/tests/xmlparse-xml/network-vf-pool-out.xml
+++ b/tests/data/xmlparse/network-vf-pool-out.xml
diff --git a/tests/xmlparse-xml/pool-dir-vol-in.xml b/tests/data/xmlparse/pool-dir-vol-in.xml
index 842abe2e..842abe2e 100644
--- a/tests/xmlparse-xml/pool-dir-vol-in.xml
+++ b/tests/data/xmlparse/pool-dir-vol-in.xml
diff --git a/tests/xmlparse-xml/pool-dir-vol-out.xml b/tests/data/xmlparse/pool-dir-vol-out.xml
index 35595ec6..35595ec6 100644
--- a/tests/xmlparse-xml/pool-dir-vol-out.xml
+++ b/tests/data/xmlparse/pool-dir-vol-out.xml
diff --git a/tests/xmlparse-xml/pool-fs-out.xml b/tests/data/xmlparse/pool-fs-out.xml
index 362b062e..362b062e 100644
--- a/tests/xmlparse-xml/pool-fs-out.xml
+++ b/tests/data/xmlparse/pool-fs-out.xml
diff --git a/tests/xmlparse-xml/pool-fs.xml b/tests/data/xmlparse/pool-fs.xml
index 9c579e2a..9c579e2a 100644
--- a/tests/xmlparse-xml/pool-fs.xml
+++ b/tests/data/xmlparse/pool-fs.xml
diff --git a/tests/xmlparse-xml/pool-gluster-out.xml b/tests/data/xmlparse/pool-gluster-out.xml
index 680ad7e0..680ad7e0 100644
--- a/tests/xmlparse-xml/pool-gluster-out.xml
+++ b/tests/data/xmlparse/pool-gluster-out.xml
diff --git a/tests/xmlparse-xml/pool-iscsi-out.xml b/tests/data/xmlparse/pool-iscsi-out.xml
index 22b3c7c6..22b3c7c6 100644
--- a/tests/xmlparse-xml/pool-iscsi-out.xml
+++ b/tests/data/xmlparse/pool-iscsi-out.xml
diff --git a/tests/xmlparse-xml/pool-rbd-out.xml b/tests/data/xmlparse/pool-rbd-out.xml
index d96e8f2d..d96e8f2d 100644
--- a/tests/xmlparse-xml/pool-rbd-out.xml
+++ b/tests/data/xmlparse/pool-rbd-out.xml
diff --git a/tests/xmlparse-xml/pool-rbd.xml b/tests/data/xmlparse/pool-rbd.xml
index c1d388e3..c1d388e3 100644
--- a/tests/xmlparse-xml/pool-rbd.xml
+++ b/tests/data/xmlparse/pool-rbd.xml
diff --git a/tests/xmlparse-xml/replace-child-build.xml b/tests/data/xmlparse/replace-child-build.xml
index 9a697893..9a697893 100644
--- a/tests/xmlparse-xml/replace-child-build.xml
+++ b/tests/data/xmlparse/replace-child-build.xml
diff --git a/tests/xmlparse-xml/replace-child-parse.xml b/tests/data/xmlparse/replace-child-parse.xml
index 7e463474..7e463474 100644
--- a/tests/xmlparse-xml/replace-child-parse.xml
+++ b/tests/data/xmlparse/replace-child-parse.xml
diff --git a/tests/magicuri b/tests/magicuri
index 00c86c36..79f37df9 100755
--- a/tests/magicuri
+++ b/tests/magicuri
@@ -27,7 +27,7 @@ def parse_options():
     options = parser.parse_args()
 
     testdir = os.path.abspath(os.path.dirname(__file__))
-    capsdir = os.path.join(testdir, "capabilities-xml/")
+    capsdir = os.path.join(testdir, "data/capabilities/")
 
     hv = options.hv
     capsfile = None
diff --git a/tests/nodedev.py b/tests/nodedev.py
index 8d82c4a4..f22516e3 100644
--- a/tests/nodedev.py
+++ b/tests/nodedev.py
@@ -34,7 +34,7 @@ class TestNodeDev(unittest.TestCase):
         return NodeDevice(self.conn, xml)
 
     def _testNode2DeviceCompare(self, nodename, devfile, nodedev=None):
-        devfile = os.path.join("tests/nodedev-xml/devxml", devfile)
+        devfile = os.path.join("tests/data/nodedev/devxml", devfile)
         if not nodedev:
             nodedev = self._nodeDevFromName(nodename)
 
diff --git a/tests/storage.py b/tests/storage.py
index 2c1914bc..472fc475 100644
--- a/tests/storage.py
+++ b/tests/storage.py
@@ -14,7 +14,7 @@ from tests import utils
 # pylint: disable=protected-access
 # Access to protected member, needed to unittest stuff
 
-basepath = os.path.join(os.getcwd(), "tests", "storage-xml")
+basepath = os.path.join(os.getcwd(), "tests", "data", "storage")
 
 
 def createPool(conn, ptype, poolname=None, fmt=None, target_path=None,
diff --git a/tests/test_inject.py b/tests/test_inject.py
index f4c164ec..1fb0db91 100755..100644
--- a/tests/test_inject.py
+++ b/tests/test_inject.py
@@ -24,9 +24,9 @@ def prompt():
     return sys.stdin.readline()
 
 
-KSOLD = "tests/inject-data/old-kickstart.ks"
-KSNEW = "tests/inject-data/new-kickstart.ks"
-PRESEED = "tests/inject-data/preseed.cfg"
+KSOLD = "tests/data/inject/old-kickstart.ks"
+KSNEW = "tests/data/inject/new-kickstart.ks"
+PRESEED = "tests/data/inject/preseed.cfg"
 
 
 class Distro(object):
diff --git a/tests/test_urls.py b/tests/test_urls.py
index 24b920c0..2d72a965 100644
--- a/tests/test_urls.py
+++ b/tests/test_urls.py
@@ -22,7 +22,7 @@ os.environ.pop("VIRTINST_TEST_SUITE", None)
 class _URLTestData(object):
     """
     Class that tracks all data needed for a single URL test case.
-    Data is stored in test_urls.ini
+    Data is stored in data/test_urls.ini
     """
     def __init__(self, name, url, detectdistro,
             testxen, testshortcircuit, kernelarg, kernelregex,
@@ -212,7 +212,7 @@ class URLTests(unittest.TestCase):
 def _make_tests():
     import configparser
     cfg = configparser.ConfigParser()
-    cfg.read("tests/test_urls.ini")
+    cfg.read("tests/data/test_urls.ini")
 
     manualpath = "~/.config/virt-manager/test_urls_manual.ini"
     cfg.read(os.path.expanduser(manualpath))
diff --git a/tests/uitests/xml/uitests-hotplug.xml b/tests/uitests/data/live/uitests-hotplug.xml
index d40ac4f0..d40ac4f0 100644
--- a/tests/uitests/xml/uitests-hotplug.xml
+++ b/tests/uitests/data/live/uitests-hotplug.xml
diff --git a/tests/uitests/xml/uitests-lxc-serial.xml b/tests/uitests/data/live/uitests-lxc-serial.xml
index 1ed357f2..1ed357f2 100644
--- a/tests/uitests/xml/uitests-lxc-serial.xml
+++ b/tests/uitests/data/live/uitests-lxc-serial.xml
diff --git a/tests/uitests/xml/uitests-spice-password.xml b/tests/uitests/data/live/uitests-spice-password.xml
index 5394b4b2..5394b4b2 100644
--- a/tests/uitests/xml/uitests-spice-password.xml
+++ b/tests/uitests/data/live/uitests-spice-password.xml
diff --git a/tests/uitests/xml/uitests-spice-specific.xml b/tests/uitests/data/live/uitests-spice-specific.xml
index f0094820..f0094820 100644
--- a/tests/uitests/xml/uitests-spice-specific.xml
+++ b/tests/uitests/data/live/uitests-spice-specific.xml
diff --git a/tests/uitests/xml/uitests-spice-standard.xml b/tests/uitests/data/live/uitests-spice-standard.xml
index 82db3697..82db3697 100644
--- a/tests/uitests/xml/uitests-spice-standard.xml
+++ b/tests/uitests/data/live/uitests-spice-standard.xml
diff --git a/tests/uitests/xml/uitests-vnc-password.xml b/tests/uitests/data/live/uitests-vnc-password.xml
index 8bf7ff4e..8bf7ff4e 100644
--- a/tests/uitests/xml/uitests-vnc-password.xml
+++ b/tests/uitests/data/live/uitests-vnc-password.xml
diff --git a/tests/uitests/xml/uitests-vnc-standard.xml b/tests/uitests/data/live/uitests-vnc-standard.xml
index f3a00114..f3a00114 100644
--- a/tests/uitests/xml/uitests-vnc-standard.xml
+++ b/tests/uitests/data/live/uitests-vnc-standard.xml
diff --git a/tests/uitests/livetests.py b/tests/uitests/livetests.py
index 53ffb569..d81ea415 100644
--- a/tests/uitests/livetests.py
+++ b/tests/uitests/livetests.py
@@ -17,7 +17,8 @@ def _vm_wrapper(vmname, uri="qemu:///system"):
     def wrap1(fn):
         def wrapper(self, *args, **kwargs):
             self.app.error_if_already_running()
-            xmlfile = "%s/xml/%s.xml" % (os.path.dirname(__file__), vmname)
+            xmlfile = "%s/data/live/%s.xml" % (
+                    os.path.dirname(__file__), vmname)
             conn = libvirt.open(uri)
             dom = conn.defineXML(open(xmlfile).read())
             try:
diff --git a/tests/utils.py b/tests/utils.py
index db8b15a8..b25c322a 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -52,7 +52,7 @@ class _URIs(object):
         self._testdriver_error = None
         self._testdriver_default = None
 
-        _capspath = "%s/tests/capabilities-xml/" % os.getcwd()
+        _capspath = "%s/tests/data/capabilities/" % os.getcwd()
         def _domcaps(path):
             return ",domcaps=" + _capspath + path
         def _caps(path):
@@ -64,7 +64,7 @@ class _URIs(object):
         self.test_suite = _testtmpl % (os.getcwd() + "/tests/testsuite.xml")
         self.test_remote = self.test_full + ",remote"
         self.test_defaultpool_collision = (_testtmpl % (os.getcwd() +
-            "/tests/cli-test-xml/testdriver-defaultpool-collision.xml"))
+            "/tests/data/clitest/testdriver-defaultpool-collision.xml"))
 
         self.xen = self.test_full + _caps("xen-rhel5.4.xml") + ",xen"
         self.lxc = self.test_full + _caps("lxc.xml") + ",lxc"
diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py
index 93dc5d96..b92a7d86 100644
--- a/tests/xmlconfig.py
+++ b/tests/xmlconfig.py
@@ -68,7 +68,7 @@ class TestXMLMisc(unittest.TestCase):
         return utils.URIs.open_testdefault_cached()
 
     def _compare(self, guest, filebase, do_install):
-        filename = os.path.join("tests/xmlconfig-xml", filebase + ".xml")
+        filename = os.path.join("tests/data/xmlconfig", filebase + ".xml")
 
         installer = _make_installer(conn=guest.conn)
         inst_xml, boot_xml = installer.start_install(
@@ -122,13 +122,13 @@ class TestXMLMisc(unittest.TestCase):
         # Simple sanity test to make sure detect_distro works. test-urls
         # does much more exhaustive testing but it's only run occasionally
         i = _make_installer(
-            location="tests/cli-test-xml/fakefedoratree")
+            location="tests/data/clitest/fakefedoratree")
         g = _make_guest()
         v = i.detect_distro(g)
         self.assertEqual(v, "fedora17")
 
         i = _make_installer(
-            location="tests/cli-test-xml/fakerhel6tree")
+            location="tests/data/clitest/fakerhel6tree")
         g = _make_guest()
         v = i.detect_distro(g)
         self.assertEqual(v, "rhel6.0")
diff --git a/tests/xmlparse.py b/tests/xmlparse.py
index deae3487..ca97f0c0 100644
--- a/tests/xmlparse.py
+++ b/tests/xmlparse.py
@@ -12,6 +12,9 @@ import virtinst
 from tests import utils
 
 
+DATADIR = "tests/data/xmlparse/"
+
+
 def sanitize_file_xml(xml):
     # s/"/'/g from generated XML, matches what libxml dumps out
     # This won't work all the time, but should be good enough for testing
@@ -85,10 +88,10 @@ class XMLParseTest(unittest.TestCase):
         output
 
         """
-        return "tests/xmlparse-xml/{!s}-out.xml".format(basename)
+        return DATADIR + "{!s}-out.xml".format(basename)
 
     def _get_test_content(self, basename, kvm=False):
-        infile = "tests/xmlparse-xml/%s-in.xml" % basename
+        infile = DATADIR + "%s-in.xml" % basename
         outfile = self._gen_outfile_path(basename)
         guest = virtinst.Guest(kvm and self.kvmconn or self.conn,
                                parsexml=open(infile).read())
@@ -767,8 +770,8 @@ class XMLParseTest(unittest.TestCase):
         self._alter_compare(guest.get_xml(), outfile)
 
     def testAlterHostdevs(self):
-        infile  = "tests/xmlparse-xml/change-hostdevs-in.xml"
-        outfile = "tests/xmlparse-xml/change-hostdevs-out.xml"
+        infile  = DATADIR + "change-hostdevs-in.xml"
+        outfile = DATADIR + "change-hostdevs-out.xml"
         guest = virtinst.Guest(self.conn,
                                parsexml=open(infile).read())
 
@@ -897,8 +900,8 @@ class XMLParseTest(unittest.TestCase):
         self._alter_compare(guest.get_xml(), outfile)
 
     def testAlterSounds(self):
-        infile  = "tests/xmlparse-xml/change-sounds-in.xml"
-        outfile = "tests/xmlparse-xml/change-sounds-out.xml"
+        infile  = DATADIR + "change-sounds-in.xml"
+        outfile = DATADIR + "change-sounds-out.xml"
         guest = virtinst.Guest(self.conn,
                                parsexml=open(infile).read())
 
@@ -1066,8 +1069,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testQEMUXMLNS(self):
         basename = "change-xmlns-qemu"
-        infile = "tests/xmlparse-xml/%s-in.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = DATADIR + "%s-in.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         guest = virtinst.Guest(self.kvmconn, parsexml=open(infile).read())
 
         check = self._make_checker(guest.xmlns_qemu.args[0])
@@ -1153,8 +1156,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testChangeSnapshot(self):
         basename = "change-snapshot"
-        infile = "tests/xmlparse-xml/%s-in.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = DATADIR + "%s-in.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         snap = virtinst.DomainSnapshot(self.conn, parsexml=open(infile).read())
 
         check = self._make_checker(snap)
@@ -1178,8 +1181,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testFSPool(self):
         basename = "pool-fs"
-        infile = "tests/xmlparse-xml/%s.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = DATADIR + "%s.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         pool = virtinst.StoragePool(self.conn, parsexml=open(infile).read())
 
         check = self._make_checker(pool)
@@ -1201,8 +1204,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testISCSIPool(self):
         basename = "pool-iscsi"
-        infile = "tests/storage-xml/%s.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = "tests/data/storage/%s.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         pool = virtinst.StoragePool(self.conn, parsexml=open(infile).read())
 
         check = self._make_checker(pool)
@@ -1215,8 +1218,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testGlusterPool(self):
         basename = "pool-gluster"
-        infile = "tests/storage-xml/%s.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = "tests/data/storage/%s.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         pool = virtinst.StoragePool(self.conn, parsexml=open(infile).read())
 
         check = self._make_checker(pool)
@@ -1229,8 +1232,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testRBDPool(self):
         basename = "pool-rbd"
-        infile = "tests/xmlparse-xml/%s.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = DATADIR + "%s.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         pool = virtinst.StoragePool(self.conn, parsexml=open(infile).read())
 
         check = self._make_checker(pool.hosts[0])
@@ -1251,8 +1254,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testVol(self):
         basename = "pool-dir-vol"
-        infile = "tests/xmlparse-xml/%s-in.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = DATADIR + "%s-in.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         vol = virtinst.StorageVolume(self.conn, parsexml=open(infile).read())
 
         check = self._make_checker(vol)
@@ -1280,8 +1283,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testNetMulti(self):
         basename = "network-multi"
-        infile = "tests/xmlparse-xml/%s-in.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = DATADIR + "%s-in.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         net = virtinst.Network(self.conn, parsexml=open(infile).read())
 
         check = self._make_checker(net)
@@ -1342,8 +1345,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testNetOpen(self):
         basename = "network-open"
-        infile = "tests/xmlparse-xml/%s-in.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = DATADIR + "%s-in.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         net = virtinst.Network(self.conn, parsexml=open(infile).read())
 
         check = self._make_checker(net)
@@ -1368,8 +1371,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testNetVfPool(self):
         basename = "network-vf-pool"
-        infile = "tests/xmlparse-xml/%s-in.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = DATADIR + "%s-in.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         net = virtinst.Network(self.conn, parsexml=open(infile).read())
 
         check = self._make_checker(net)
@@ -1393,8 +1396,8 @@ class XMLParseTest(unittest.TestCase):
     def testCPUUnknownClear(self):
         # Make sure .clear() even removes XML elements we don't know about
         basename = "clear-cpu-unknown-vals"
-        infile = "tests/xmlparse-xml/%s-in.xml" % basename
-        outfile = "tests/xmlparse-xml/%s-out.xml" % basename
+        infile = DATADIR + "%s-in.xml" % basename
+        outfile = DATADIR + "%s-out.xml" % basename
         guest = virtinst.Guest(self.kvmconn, parsexml=open(infile).read())
 
         guest.cpu.copy_host_cpu(guest)
@@ -1403,8 +1406,8 @@ class XMLParseTest(unittest.TestCase):
 
     def testDomainRoundtrip(self):
         # Make sure our XML engine doesn't mangle non-libvirt XML bits
-        infile = "tests/xmlparse-xml/domain-roundtrip.xml"
-        outfile = "tests/xmlparse-xml/domain-roundtrip.xml"
+        infile = DATADIR + "domain-roundtrip.xml"
+        outfile = DATADIR + "domain-roundtrip.xml"
         guest = virtinst.Guest(self.conn, parsexml=open(infile).read())
 
         utils.diff_compare(guest.get_xml(), outfile)
@@ -1455,8 +1458,8 @@ class XMLParseTest(unittest.TestCase):
         assert str(virtinst.DeviceDisk.driver_cache)
 
     def testReplaceChildParse(self):
-        buildfile = "tests/xmlparse-xml/replace-child-build.xml"
-        parsefile = "tests/xmlparse-xml/replace-child-parse.xml"
+        buildfile = DATADIR + "replace-child-build.xml"
+        parsefile = DATADIR + "replace-child-parse.xml"
 
         def mkdisk(target):
             disk = virtinst.DeviceDisk(self.conn)
diff --git a/virtinst/install/urlfetcher.py b/virtinst/install/urlfetcher.py
index e52efc8e..fe5c5d7e 100644
--- a/virtinst/install/urlfetcher.py
+++ b/virtinst/install/urlfetcher.py
@@ -30,7 +30,7 @@ def _make_mock_url(url, filesyntax):
     if url.endswith("treeinfo"):
         # If the url is requesting treeinfo, give a fake treeinfo from
         # our testsuite data
-        fn = ("%s/../../tests/cli-test-xml/fakerhel6tree/.treeinfo" %
+        fn = ("%s/../../tests/data/clitest/fakerhel6tree/.treeinfo" %
                 os.path.abspath(os.path.dirname(__file__)))
         abspath = os.path.abspath(fn)
     else: