tests: Rename all test files to have test_ prefix

This will help for a possible future conversion to pytest

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

236 files changed, 21 insertions, 21 deletions

diff --git a/setup.py b/setup.py
index cc776598..7db0439f 100755
--- a/setup.py
+++ b/setup.py
@@ -516,18 +516,18 @@ class TestCommand(TestBaseCommand):
         '''
         Finds all the tests modules in tests/, and runs them.
         '''
-        excludes = ["dist.py", "test_urls.py", "test_inject.py"]
+        excludes = ["test_dist.py", "test_urls.py", "test_inject.py"]
         testfiles = self._find_tests_in_dir("tests", excludes)
 
-        # Put clitest at the end, since it takes the longest
+        # Put test_cli at the end, since it takes the longest
         for f in testfiles[:]:
-            if "clitest" in f:
+            if "test_cli" in f:
                 testfiles.remove(f)
                 testfiles.append(f)
 
-        # Always want to put checkprops at the end to get accurate results
+        # Always want to put test_checkprops at the end to get accurate results
         for f in testfiles[:]:
-            if "checkprops" in f:
+            if "test_checkprops" in f:
                 testfiles.remove(f)
                 if not self.testfile:
                     testfiles.append(f)
@@ -593,7 +593,7 @@ class TestDist(TestBaseCommand):
     description = "Tests to run before cutting a release"
 
     def run(self):
-        self._testfiles = ["tests.dist"]
+        self._testfiles = ["tests.test_dist"]
         TestBaseCommand.run(self)
 
 
diff --git a/tests/data/clitest/admin-password.txt b/tests/data/cli/admin-password.txt
index 323fae03..323fae03 100644
--- a/tests/data/clitest/admin-password.txt
+++ b/tests/data/cli/admin-password.txt
diff --git a/tests/data/clitest/clone-disk-managed.xml b/tests/data/cli/clone-disk-managed.xml
index 8fe1fe2d..8fe1fe2d 100644
--- a/tests/data/clitest/clone-disk-managed.xml
+++ b/tests/data/cli/clone-disk-managed.xml
diff --git a/tests/data/clitest/clone-disk-noexist.xml b/tests/data/cli/clone-disk-noexist.xml
index d99b1aec..d99b1aec 100644
--- a/tests/data/clitest/clone-disk-noexist.xml
+++ b/tests/data/cli/clone-disk-noexist.xml
diff --git a/tests/data/clitest/clone-disk.xml b/tests/data/cli/clone-disk.xml
index da1eb0a6..da1eb0a6 100644
--- a/tests/data/clitest/clone-disk.xml
+++ b/tests/data/cli/clone-disk.xml
diff --git a/tests/data/clitest/clone-nvram-auto.xml b/tests/data/cli/clone-nvram-auto.xml
index dc95f6ac..dc95f6ac 100644
--- a/tests/data/clitest/clone-nvram-auto.xml
+++ b/tests/data/cli/clone-nvram-auto.xml
diff --git a/tests/data/clitest/cloudinit/meta-data.txt b/tests/data/cli/cloudinit/meta-data.txt
index 21dcae42..21dcae42 100644
--- a/tests/data/clitest/cloudinit/meta-data.txt
+++ b/tests/data/cli/cloudinit/meta-data.txt
diff --git a/tests/data/clitest/cloudinit/ssh-key.txt b/tests/data/cli/cloudinit/ssh-key.txt
index 385cf112..385cf112 100644
--- a/tests/data/clitest/cloudinit/ssh-key.txt
+++ b/tests/data/cli/cloudinit/ssh-key.txt
diff --git a/tests/data/clitest/cloudinit/user-data.txt b/tests/data/cli/cloudinit/user-data.txt
index 620c3c20..620c3c20 100644
--- a/tests/data/clitest/cloudinit/user-data.txt
+++ b/tests/data/cli/cloudinit/user-data.txt
diff --git a/tests/data/clitest/compare/virt-clone-clone-auto1.xml b/tests/data/cli/compare/virt-clone-clone-auto1.xml
index 67360bcb..67360bcb 100644
--- a/tests/data/clitest/compare/virt-clone-clone-auto1.xml
+++ b/tests/data/cli/compare/virt-clone-clone-auto1.xml
diff --git a/tests/data/clitest/compare/virt-clone-clone-auto2.xml b/tests/data/cli/compare/virt-clone-clone-auto2.xml
index 7ede76cd..7ede76cd 100644
--- a/tests/data/clitest/compare/virt-clone-clone-auto2.xml
+++ b/tests/data/cli/compare/virt-clone-clone-auto2.xml
diff --git a/tests/data/clitest/compare/virt-install-aarch64-cdrom.xml b/tests/data/cli/compare/virt-install-aarch64-cdrom.xml
index 6d2ec066..6d2ec066 100644
--- a/tests/data/clitest/compare/virt-install-aarch64-cdrom.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-cdrom.xml
diff --git a/tests/data/clitest/compare/virt-install-aarch64-firmware-no-override.xml b/tests/data/cli/compare/virt-install-aarch64-firmware-no-override.xml
index e899ef00..e899ef00 100644
--- a/tests/data/clitest/compare/virt-install-aarch64-firmware-no-override.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-firmware-no-override.xml
diff --git a/tests/data/clitest/compare/virt-install-aarch64-graphics.xml b/tests/data/cli/compare/virt-install-aarch64-graphics.xml
index 3c6cdfde..3c6cdfde 100644
--- a/tests/data/clitest/compare/virt-install-aarch64-graphics.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-graphics.xml
diff --git a/tests/data/clitest/compare/virt-install-aarch64-headless.xml b/tests/data/cli/compare/virt-install-aarch64-headless.xml
index d6f23cc1..d6f23cc1 100644
--- a/tests/data/clitest/compare/virt-install-aarch64-headless.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-headless.xml
diff --git a/tests/data/clitest/compare/virt-install-aarch64-kvm-gic.xml b/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml
index dc844ce4..dc844ce4 100644
--- a/tests/data/clitest/compare/virt-install-aarch64-kvm-gic.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml
diff --git a/tests/data/clitest/compare/virt-install-aarch64-kvm-import.xml b/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml
index dd2e2238..dd2e2238 100644
--- a/tests/data/clitest/compare/virt-install-aarch64-kvm-import.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml
diff --git a/tests/data/clitest/compare/virt-install-aarch64-machdefault.xml b/tests/data/cli/compare/virt-install-aarch64-machdefault.xml
index 597d15a4..597d15a4 100644
--- a/tests/data/clitest/compare/virt-install-aarch64-machdefault.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-machdefault.xml
diff --git a/tests/data/clitest/compare/virt-install-aarch64-machvirt.xml b/tests/data/cli/compare/virt-install-aarch64-machvirt.xml
index 597d15a4..597d15a4 100644
--- a/tests/data/clitest/compare/virt-install-aarch64-machvirt.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-machvirt.xml
diff --git a/tests/data/clitest/compare/virt-install-arm-defaultmach-f20.xml b/tests/data/cli/compare/virt-install-arm-defaultmach-f20.xml
index 02c53dc1..02c53dc1 100644
--- a/tests/data/clitest/compare/virt-install-arm-defaultmach-f20.xml
+++ b/tests/data/cli/compare/virt-install-arm-defaultmach-f20.xml
diff --git a/tests/data/clitest/compare/virt-install-arm-kvm-import.xml b/tests/data/cli/compare/virt-install-arm-kvm-import.xml
index bd00f6c9..bd00f6c9 100644
--- a/tests/data/clitest/compare/virt-install-arm-kvm-import.xml
+++ b/tests/data/cli/compare/virt-install-arm-kvm-import.xml
diff --git a/tests/data/clitest/compare/virt-install-arm-vexpress-plain.xml b/tests/data/cli/compare/virt-install-arm-vexpress-plain.xml
index afaf37e8..afaf37e8 100644
--- a/tests/data/clitest/compare/virt-install-arm-vexpress-plain.xml
+++ b/tests/data/cli/compare/virt-install-arm-vexpress-plain.xml
diff --git a/tests/data/clitest/compare/virt-install-arm-virt-f20.xml b/tests/data/cli/compare/virt-install-arm-virt-f20.xml
index 98f6827f..98f6827f 100644
--- a/tests/data/clitest/compare/virt-install-arm-virt-f20.xml
+++ b/tests/data/cli/compare/virt-install-arm-virt-f20.xml
diff --git a/tests/data/clitest/compare/virt-install-boot-loader-secure.xml b/tests/data/cli/compare/virt-install-boot-loader-secure.xml
index fe6ad438..fe6ad438 100644
--- a/tests/data/clitest/compare/virt-install-boot-loader-secure.xml
+++ b/tests/data/cli/compare/virt-install-boot-loader-secure.xml
diff --git a/tests/data/clitest/compare/virt-install-boot-uefi.xml b/tests/data/cli/compare/virt-install-boot-uefi.xml
index c97f86fc..c97f86fc 100644
--- a/tests/data/clitest/compare/virt-install-boot-uefi.xml
+++ b/tests/data/cli/compare/virt-install-boot-uefi.xml
diff --git a/tests/data/clitest/compare/virt-install-cdrom-centos-label.xml b/tests/data/cli/compare/virt-install-cdrom-centos-label.xml
index 3fbea52a..95f4a2fd 100644
--- a/tests/data/clitest/compare/virt-install-cdrom-centos-label.xml
+++ b/tests/data/cli/compare/virt-install-cdrom-centos-label.xml
@@ -39,7 +39,7 @@
     </disk>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
-      <source file="tests/data/clitest/fake-centos65-label.iso"/>
+      <source file="tests/data/cli/fake-centos65-label.iso"/>
       <target dev="hda" bus="ide"/>
       <readonly/>
     </disk>
diff --git a/tests/data/clitest/compare/virt-install-cdrom-double.xml b/tests/data/cli/compare/virt-install-cdrom-double.xml
index 002ca71f..002ca71f 100644
--- a/tests/data/clitest/compare/virt-install-cdrom-double.xml
+++ b/tests/data/cli/compare/virt-install-cdrom-double.xml
diff --git a/tests/data/clitest/compare/virt-install-cdrom-url.xml b/tests/data/cli/compare/virt-install-cdrom-url.xml
index 890cb19a..890cb19a 100644
--- a/tests/data/clitest/compare/virt-install-cdrom-url.xml
+++ b/tests/data/cli/compare/virt-install-cdrom-url.xml
diff --git a/tests/data/clitest/compare/virt-install-cloud-init-default.xml b/tests/data/cli/compare/virt-install-cloud-init-default.xml
index 93309bbe..93309bbe 100644
--- a/tests/data/clitest/compare/virt-install-cloud-init-default.xml
+++ b/tests/data/cli/compare/virt-install-cloud-init-default.xml
diff --git a/tests/data/clitest/compare/virt-install-cloud-init-options.xml b/tests/data/cli/compare/virt-install-cloud-init-options.xml
index 93309bbe..93309bbe 100644
--- a/tests/data/clitest/compare/virt-install-cloud-init-options.xml
+++ b/tests/data/cli/compare/virt-install-cloud-init-options.xml
diff --git a/tests/data/clitest/compare/virt-install-cpu-disable-sec.xml b/tests/data/cli/compare/virt-install-cpu-disable-sec.xml
index f83191b4..f83191b4 100644
--- a/tests/data/clitest/compare/virt-install-cpu-disable-sec.xml
+++ b/tests/data/cli/compare/virt-install-cpu-disable-sec.xml
diff --git a/tests/data/clitest/compare/virt-install-cpu-rhel7-default.xml b/tests/data/cli/compare/virt-install-cpu-rhel7-default.xml
index 478118c4..478118c4 100644
--- a/tests/data/clitest/compare/virt-install-cpu-rhel7-default.xml
+++ b/tests/data/cli/compare/virt-install-cpu-rhel7-default.xml
diff --git a/tests/data/clitest/compare/virt-install-cpuset-auto.xml b/tests/data/cli/compare/virt-install-cpuset-auto.xml
index 85e6672c..85e6672c 100644
--- a/tests/data/clitest/compare/virt-install-cpuset-auto.xml
+++ b/tests/data/cli/compare/virt-install-cpuset-auto.xml
diff --git a/tests/data/clitest/compare/virt-install-default-f27.xml b/tests/data/cli/compare/virt-install-default-f27.xml
index b4df2bd2..b4df2bd2 100644
--- a/tests/data/clitest/compare/virt-install-default-f27.xml
+++ b/tests/data/cli/compare/virt-install-default-f27.xml
diff --git a/tests/data/clitest/compare/virt-install-default.xml b/tests/data/cli/compare/virt-install-default.xml
index e88ccbc3..e88ccbc3 100644
--- a/tests/data/clitest/compare/virt-install-default.xml
+++ b/tests/data/cli/compare/virt-install-default.xml
diff --git a/tests/data/clitest/compare/virt-install-f21-kvm-remote.xml b/tests/data/cli/compare/virt-install-f21-kvm-remote.xml
index c5a9a407..c5a9a407 100644
--- a/tests/data/clitest/compare/virt-install-f21-kvm-remote.xml
+++ b/tests/data/cli/compare/virt-install-f21-kvm-remote.xml
diff --git a/tests/data/clitest/compare/virt-install-fake-ftp.xml b/tests/data/cli/compare/virt-install-fake-ftp.xml
index 48190da1..48190da1 100644
--- a/tests/data/clitest/compare/virt-install-fake-ftp.xml
+++ b/tests/data/cli/compare/virt-install-fake-ftp.xml
diff --git a/tests/data/clitest/compare/virt-install-fake-http.xml b/tests/data/cli/compare/virt-install-fake-http.xml
index 8292e63a..8292e63a 100644
--- a/tests/data/clitest/compare/virt-install-fake-http.xml
+++ b/tests/data/cli/compare/virt-install-fake-http.xml
diff --git a/tests/data/clitest/compare/virt-install-fs-default.xml b/tests/data/cli/compare/virt-install-fs-default.xml
index 7344fc4c..7344fc4c 100644
--- a/tests/data/clitest/compare/virt-install-fs-default.xml
+++ b/tests/data/cli/compare/virt-install-fs-default.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-centos7.xml b/tests/data/cli/compare/virt-install-kvm-centos7.xml
index 8cf905dc..8cf905dc 100644
--- a/tests/data/clitest/compare/virt-install-kvm-centos7.xml
+++ b/tests/data/cli/compare/virt-install-kvm-centos7.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-cpu-default-fallback.xml b/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml
index d3b862cb..d3b862cb 100644
--- a/tests/data/clitest/compare/virt-install-kvm-cpu-default-fallback.xml
+++ b/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-fedoralatest-url.xml b/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml
index a55e7cee..a55e7cee 100644
--- a/tests/data/clitest/compare/virt-install-kvm-fedoralatest-url.xml
+++ b/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-hostcopy-fallback.xml b/tests/data/cli/compare/virt-install-kvm-hostcopy-fallback.xml
index ca28ba42..ca28ba42 100644
--- a/tests/data/clitest/compare/virt-install-kvm-hostcopy-fallback.xml
+++ b/tests/data/cli/compare/virt-install-kvm-hostcopy-fallback.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-i686-uefi.xml b/tests/data/cli/compare/virt-install-kvm-i686-uefi.xml
index 9c86bde8..9c86bde8 100644
--- a/tests/data/clitest/compare/virt-install-kvm-i686-uefi.xml
+++ b/tests/data/cli/compare/virt-install-kvm-i686-uefi.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-rhel5.xml b/tests/data/cli/compare/virt-install-kvm-rhel5.xml
index ef09190c..ef09190c 100644
--- a/tests/data/clitest/compare/virt-install-kvm-rhel5.xml
+++ b/tests/data/cli/compare/virt-install-kvm-rhel5.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-rhel6.xml b/tests/data/cli/compare/virt-install-kvm-rhel6.xml
index bef67674..bef67674 100644
--- a/tests/data/clitest/compare/virt-install-kvm-rhel6.xml
+++ b/tests/data/cli/compare/virt-install-kvm-rhel6.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-rhel7.xml b/tests/data/cli/compare/virt-install-kvm-rhel7.xml
index ed21e080..ed21e080 100644
--- a/tests/data/clitest/compare/virt-install-kvm-rhel7.xml
+++ b/tests/data/cli/compare/virt-install-kvm-rhel7.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-session-defaults.xml b/tests/data/cli/compare/virt-install-kvm-session-defaults.xml
index 0c91b849..0c91b849 100644
--- a/tests/data/clitest/compare/virt-install-kvm-session-defaults.xml
+++ b/tests/data/cli/compare/virt-install-kvm-session-defaults.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-win10.xml b/tests/data/cli/compare/virt-install-kvm-win10.xml
index 9197de73..9197de73 100644
--- a/tests/data/clitest/compare/virt-install-kvm-win10.xml
+++ b/tests/data/cli/compare/virt-install-kvm-win10.xml
diff --git a/tests/data/clitest/compare/virt-install-kvm-win2k3-cdrom.xml b/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml
index f5bef098..f5bef098 100644
--- a/tests/data/clitest/compare/virt-install-kvm-win2k3-cdrom.xml
+++ b/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml
diff --git a/tests/data/clitest/compare/virt-install-location-iso.xml b/tests/data/cli/compare/virt-install-location-iso.xml
index d83e506d..8a5a4bcf 100644
--- a/tests/data/clitest/compare/virt-install-location-iso.xml
+++ b/tests/data/cli/compare/virt-install-location-iso.xml
@@ -39,7 +39,7 @@
     </disk>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
-      <source file="tests/data/clitest/fake-fedora17-tree.iso"/>
+      <source file="tests/data/cli/fake-fedora17-tree.iso"/>
       <target dev="hda" bus="ide"/>
       <readonly/>
     </disk>
diff --git a/tests/data/clitest/compare/virt-install-location-manual-kernel.xml b/tests/data/cli/compare/virt-install-location-manual-kernel.xml
index 12d10510..fbb1b5d3 100644
--- a/tests/data/clitest/compare/virt-install-location-manual-kernel.xml
+++ b/tests/data/cli/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/data/clitest/fake-no-osinfo.iso"/>
+      <source file="tests/data/cli/fake-no-osinfo.iso"/>
       <target dev="hda" bus="ide"/>
       <readonly/>
     </disk>
diff --git a/tests/data/clitest/compare/virt-install-manual-init.xml b/tests/data/cli/compare/virt-install-manual-init.xml
index cff1d3d9..cff1d3d9 100644
--- a/tests/data/clitest/compare/virt-install-manual-init.xml
+++ b/tests/data/cli/compare/virt-install-manual-init.xml
diff --git a/tests/data/clitest/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml
index 5370a2ff..5370a2ff 100644
--- a/tests/data/clitest/compare/virt-install-many-devices.xml
+++ b/tests/data/cli/compare/virt-install-many-devices.xml
diff --git a/tests/data/clitest/compare/virt-install-memory-hotplug.xml b/tests/data/cli/compare/virt-install-memory-hotplug.xml
index 897a6c47..897a6c47 100644
--- a/tests/data/clitest/compare/virt-install-memory-hotplug.xml
+++ b/tests/data/cli/compare/virt-install-memory-hotplug.xml
diff --git a/tests/data/clitest/compare/virt-install-memory-option-backcompat.xml b/tests/data/cli/compare/virt-install-memory-option-backcompat.xml
index ebb2e923..ebb2e923 100644
--- a/tests/data/clitest/compare/virt-install-memory-option-backcompat.xml
+++ b/tests/data/cli/compare/virt-install-memory-option-backcompat.xml
diff --git a/tests/data/clitest/compare/virt-install-network-install-resources.xml b/tests/data/cli/compare/virt-install-network-install-resources.xml
index 03595873..03595873 100644
--- a/tests/data/clitest/compare/virt-install-network-install-resources.xml
+++ b/tests/data/cli/compare/virt-install-network-install-resources.xml
diff --git a/tests/data/clitest/compare/virt-install-noargs-fail.xml b/tests/data/cli/compare/virt-install-noargs-fail.xml
index 67af1506..67af1506 100644
--- a/tests/data/clitest/compare/virt-install-noargs-fail.xml
+++ b/tests/data/cli/compare/virt-install-noargs-fail.xml
diff --git a/tests/data/clitest/compare/virt-install-openbsd-defaults.xml b/tests/data/cli/compare/virt-install-openbsd-defaults.xml
index ecaf1270..ecaf1270 100644
--- a/tests/data/clitest/compare/virt-install-openbsd-defaults.xml
+++ b/tests/data/cli/compare/virt-install-openbsd-defaults.xml
diff --git a/tests/data/clitest/compare/virt-install-osinfo-multiple-short-id.xml b/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml
index 13d9a59d..13d9a59d 100644
--- a/tests/data/clitest/compare/virt-install-osinfo-multiple-short-id.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml
diff --git a/tests/data/clitest/compare/virt-install-osinfo-netinst-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml
index db4f09a6..8a1fb075 100644
--- a/tests/data/clitest/compare/virt-install-osinfo-netinst-unattended.xml
+++ b/tests/data/cli/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/data/clitest/fake-f26-netinst.iso"/>
+      <source file="tests/data/cli/fake-f26-netinst.iso"/>
       <target dev="sda" bus="sata"/>
       <readonly/>
     </disk>
diff --git a/tests/data/clitest/compare/virt-install-osinfo-url-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml
index 35f3c6ca..35f3c6ca 100644
--- a/tests/data/clitest/compare/virt-install-osinfo-url-unattended.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml
diff --git a/tests/data/clitest/compare/virt-install-osinfo-url-with-disk.xml b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
index 37b7e575..37b7e575 100644
--- a/tests/data/clitest/compare/virt-install-osinfo-url-with-disk.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
diff --git a/tests/data/clitest/compare/virt-install-osinfo-url.xml b/tests/data/cli/compare/virt-install-osinfo-url.xml
index 68a7932c..68a7932c 100644
--- a/tests/data/clitest/compare/virt-install-osinfo-url.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-url.xml
diff --git a/tests/data/clitest/compare/virt-install-osinfo-win7-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml
index fcf83bde..ab8e13fc 100644
--- a/tests/data/clitest/compare/virt-install-osinfo-win7-unattended.xml
+++ b/tests/data/cli/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/data/clitest/fake-win7.iso"/>
+      <source file="tests/data/cli/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/data/clitest/fake-win7.iso"/>
+      <source file="tests/data/cli/fake-win7.iso"/>
       <target dev="sda" bus="sata"/>
       <readonly/>
     </disk>
diff --git a/tests/data/clitest/compare/virt-install-osvariant-defaults-pxe.xml b/tests/data/cli/compare/virt-install-osvariant-defaults-pxe.xml
index f07b7ca4..f07b7ca4 100644
--- a/tests/data/clitest/compare/virt-install-osvariant-defaults-pxe.xml
+++ b/tests/data/cli/compare/virt-install-osvariant-defaults-pxe.xml
diff --git a/tests/data/clitest/compare/virt-install-osvariant-noargs-fail.xml b/tests/data/cli/compare/virt-install-osvariant-noargs-fail.xml
index 961ae4c6..961ae4c6 100644
--- a/tests/data/clitest/compare/virt-install-osvariant-noargs-fail.xml
+++ b/tests/data/cli/compare/virt-install-osvariant-noargs-fail.xml
diff --git a/tests/data/clitest/compare/virt-install-ppc64-graphics.xml b/tests/data/cli/compare/virt-install-ppc64-graphics.xml
index 4a8640fc..4a8640fc 100644
--- a/tests/data/clitest/compare/virt-install-ppc64-graphics.xml
+++ b/tests/data/cli/compare/virt-install-ppc64-graphics.xml
diff --git a/tests/data/clitest/compare/virt-install-ppc64-headless.xml b/tests/data/cli/compare/virt-install-ppc64-headless.xml
index a8434510..a8434510 100644
--- a/tests/data/clitest/compare/virt-install-ppc64-headless.xml
+++ b/tests/data/cli/compare/virt-install-ppc64-headless.xml
diff --git a/tests/data/clitest/compare/virt-install-ppc64-machdefault-f20.xml b/tests/data/cli/compare/virt-install-ppc64-machdefault-f20.xml
index 2f5cdc33..2f5cdc33 100644
--- a/tests/data/clitest/compare/virt-install-ppc64-machdefault-f20.xml
+++ b/tests/data/cli/compare/virt-install-ppc64-machdefault-f20.xml
diff --git a/tests/data/clitest/compare/virt-install-ppc64-pseries-f20.xml b/tests/data/cli/compare/virt-install-ppc64-pseries-f20.xml
index 1960448b..1960448b 100644
--- a/tests/data/clitest/compare/virt-install-ppc64-pseries-f20.xml
+++ b/tests/data/cli/compare/virt-install-ppc64-pseries-f20.xml
diff --git a/tests/data/clitest/compare/virt-install-ppc64le-kvm-import.xml b/tests/data/cli/compare/virt-install-ppc64le-kvm-import.xml
index e9339ac5..e9339ac5 100644
--- a/tests/data/clitest/compare/virt-install-ppc64le-kvm-import.xml
+++ b/tests/data/cli/compare/virt-install-ppc64le-kvm-import.xml
diff --git a/tests/data/clitest/compare/virt-install-q35-defaults.xml b/tests/data/cli/compare/virt-install-q35-defaults.xml
index d75e2869..d75e2869 100644
--- a/tests/data/clitest/compare/virt-install-q35-defaults.xml
+++ b/tests/data/cli/compare/virt-install-q35-defaults.xml
diff --git a/tests/data/clitest/compare/virt-install-qemu-32-on-64.xml b/tests/data/cli/compare/virt-install-qemu-32-on-64.xml
index 19955f0e..19955f0e 100644
--- a/tests/data/clitest/compare/virt-install-qemu-32-on-64.xml
+++ b/tests/data/cli/compare/virt-install-qemu-32-on-64.xml
diff --git a/tests/data/clitest/compare/virt-install-qemu-plain.xml b/tests/data/cli/compare/virt-install-qemu-plain.xml
index af3948d9..af3948d9 100644
--- a/tests/data/clitest/compare/virt-install-qemu-plain.xml
+++ b/tests/data/cli/compare/virt-install-qemu-plain.xml
diff --git a/tests/data/clitest/compare/virt-install-quiet-url.xml b/tests/data/cli/compare/virt-install-quiet-url.xml
index e69de29b..e69de29b 100644
--- a/tests/data/clitest/compare/virt-install-quiet-url.xml
+++ b/tests/data/cli/compare/virt-install-quiet-url.xml
diff --git a/tests/data/clitest/compare/virt-install-riscv64-graphics.xml b/tests/data/cli/compare/virt-install-riscv64-graphics.xml
index 200d5a28..200d5a28 100644
--- a/tests/data/clitest/compare/virt-install-riscv64-graphics.xml
+++ b/tests/data/cli/compare/virt-install-riscv64-graphics.xml
diff --git a/tests/data/clitest/compare/virt-install-riscv64-headless.xml b/tests/data/cli/compare/virt-install-riscv64-headless.xml
index b7863bc8..b7863bc8 100644
--- a/tests/data/clitest/compare/virt-install-riscv64-headless.xml
+++ b/tests/data/cli/compare/virt-install-riscv64-headless.xml
diff --git a/tests/data/clitest/compare/virt-install-s390x-cdrom-KVMIBM.xml b/tests/data/cli/compare/virt-install-s390x-cdrom-KVMIBM.xml
index a2e40ec2..a2e40ec2 100644
--- a/tests/data/clitest/compare/virt-install-s390x-cdrom-KVMIBM.xml
+++ b/tests/data/cli/compare/virt-install-s390x-cdrom-KVMIBM.xml
diff --git a/tests/data/clitest/compare/virt-install-s390x-cdrom.xml b/tests/data/cli/compare/virt-install-s390x-cdrom.xml
index 7161a1d0..7161a1d0 100644
--- a/tests/data/clitest/compare/virt-install-s390x-cdrom.xml
+++ b/tests/data/cli/compare/virt-install-s390x-cdrom.xml
diff --git a/tests/data/clitest/compare/virt-install-s390x-graphics.xml b/tests/data/cli/compare/virt-install-s390x-graphics.xml
index f96abb00..f96abb00 100644
--- a/tests/data/clitest/compare/virt-install-s390x-graphics.xml
+++ b/tests/data/cli/compare/virt-install-s390x-graphics.xml
diff --git a/tests/data/clitest/compare/virt-install-s390x-headless.xml b/tests/data/cli/compare/virt-install-s390x-headless.xml
index 863b69a0..863b69a0 100644
--- a/tests/data/clitest/compare/virt-install-s390x-headless.xml
+++ b/tests/data/cli/compare/virt-install-s390x-headless.xml
diff --git a/tests/data/clitest/compare/virt-install-simple-pxe.xml b/tests/data/cli/compare/virt-install-simple-pxe.xml
index 577470a0..577470a0 100644
--- a/tests/data/clitest/compare/virt-install-simple-pxe.xml
+++ b/tests/data/cli/compare/virt-install-simple-pxe.xml
diff --git a/tests/data/clitest/compare/virt-install-singleton-config-1.xml b/tests/data/cli/compare/virt-install-singleton-config-1.xml
index 518a0099..518a0099 100644
--- a/tests/data/clitest/compare/virt-install-singleton-config-1.xml
+++ b/tests/data/cli/compare/virt-install-singleton-config-1.xml
diff --git a/tests/data/clitest/compare/virt-install-singleton-config-2.xml b/tests/data/cli/compare/virt-install-singleton-config-2.xml
index 117a1076..117a1076 100644
--- a/tests/data/clitest/compare/virt-install-singleton-config-2.xml
+++ b/tests/data/cli/compare/virt-install-singleton-config-2.xml
diff --git a/tests/data/clitest/compare/virt-install-singleton-config-3.xml b/tests/data/cli/compare/virt-install-singleton-config-3.xml
index cc26ff3b..cc26ff3b 100644
--- a/tests/data/clitest/compare/virt-install-singleton-config-3.xml
+++ b/tests/data/cli/compare/virt-install-singleton-config-3.xml
diff --git a/tests/data/clitest/compare/virt-install-test-url-detection.xml b/tests/data/cli/compare/virt-install-test-url-detection.xml
index e7fec4d2..e7fec4d2 100644
--- a/tests/data/clitest/compare/virt-install-test-url-detection.xml
+++ b/tests/data/cli/compare/virt-install-test-url-detection.xml
diff --git a/tests/data/clitest/compare/virt-install-vz-ct-template.xml b/tests/data/cli/compare/virt-install-vz-ct-template.xml
index 4b1ccb33..4b1ccb33 100644
--- a/tests/data/clitest/compare/virt-install-vz-ct-template.xml
+++ b/tests/data/cli/compare/virt-install-vz-ct-template.xml
diff --git a/tests/data/clitest/compare/virt-install-w2k3-cdrom.xml b/tests/data/cli/compare/virt-install-w2k3-cdrom.xml
index 12154ebd..12154ebd 100644
--- a/tests/data/clitest/compare/virt-install-w2k3-cdrom.xml
+++ b/tests/data/cli/compare/virt-install-w2k3-cdrom.xml
diff --git a/tests/data/clitest/compare/virt-install-win7-uefi.xml b/tests/data/cli/compare/virt-install-win7-uefi.xml
index 6a341f5e..6a341f5e 100644
--- a/tests/data/clitest/compare/virt-install-win7-uefi.xml
+++ b/tests/data/cli/compare/virt-install-win7-uefi.xml
diff --git a/tests/data/clitest/compare/virt-install-x86_64-graphics.xml b/tests/data/cli/compare/virt-install-x86_64-graphics.xml
index ea9b184f..ea9b184f 100644
--- a/tests/data/clitest/compare/virt-install-x86_64-graphics.xml
+++ b/tests/data/cli/compare/virt-install-x86_64-graphics.xml
diff --git a/tests/data/clitest/compare/virt-install-x86_64-headless.xml b/tests/data/cli/compare/virt-install-x86_64-headless.xml
index 8234c958..8234c958 100644
--- a/tests/data/clitest/compare/virt-install-x86_64-headless.xml
+++ b/tests/data/cli/compare/virt-install-x86_64-headless.xml
diff --git a/tests/data/clitest/compare/virt-install-x86_64-launch-security-sev-full.xml b/tests/data/cli/compare/virt-install-x86_64-launch-security-sev-full.xml
index b58294ed..b58294ed 100644
--- a/tests/data/clitest/compare/virt-install-x86_64-launch-security-sev-full.xml
+++ b/tests/data/cli/compare/virt-install-x86_64-launch-security-sev-full.xml
diff --git a/tests/data/clitest/compare/virt-install-x86_64-launch-security-sev.xml b/tests/data/cli/compare/virt-install-x86_64-launch-security-sev.xml
index 21355954..21355954 100644
--- a/tests/data/clitest/compare/virt-install-x86_64-launch-security-sev.xml
+++ b/tests/data/cli/compare/virt-install-x86_64-launch-security-sev.xml
diff --git a/tests/data/clitest/compare/virt-install-xen-default.xml b/tests/data/cli/compare/virt-install-xen-default.xml
index 9576725d..9576725d 100644
--- a/tests/data/clitest/compare/virt-install-xen-default.xml
+++ b/tests/data/cli/compare/virt-install-xen-default.xml
diff --git a/tests/data/clitest/compare/virt-install-xen-hvm.xml b/tests/data/cli/compare/virt-install-xen-hvm.xml
index bc95c9ca..bc95c9ca 100644
--- a/tests/data/clitest/compare/virt-install-xen-hvm.xml
+++ b/tests/data/cli/compare/virt-install-xen-hvm.xml
diff --git a/tests/data/clitest/compare/virt-install-xen-pv.xml b/tests/data/cli/compare/virt-install-xen-pv.xml
index e5d961d4..e5d961d4 100644
--- a/tests/data/clitest/compare/virt-install-xen-pv.xml
+++ b/tests/data/cli/compare/virt-install-xen-pv.xml
diff --git a/tests/data/clitest/compare/virt-xml-add-disk-basic-start.xml b/tests/data/cli/compare/virt-xml-add-disk-basic-start.xml
index 0071d9e7..0071d9e7 100644
--- a/tests/data/clitest/compare/virt-xml-add-disk-basic-start.xml
+++ b/tests/data/cli/compare/virt-xml-add-disk-basic-start.xml
diff --git a/tests/data/clitest/compare/virt-xml-add-disk-basic.xml b/tests/data/cli/compare/virt-xml-add-disk-basic.xml
index 8035c31f..8035c31f 100644
--- a/tests/data/clitest/compare/virt-xml-add-disk-basic.xml
+++ b/tests/data/cli/compare/virt-xml-add-disk-basic.xml
diff --git a/tests/data/clitest/compare/virt-xml-add-disk-create-storage-start.xml b/tests/data/cli/compare/virt-xml-add-disk-create-storage-start.xml
index 6a02dcc3..6a02dcc3 100644
--- a/tests/data/clitest/compare/virt-xml-add-disk-create-storage-start.xml
+++ b/tests/data/cli/compare/virt-xml-add-disk-create-storage-start.xml
diff --git a/tests/data/clitest/compare/virt-xml-add-disk-create-storage.xml b/tests/data/cli/compare/virt-xml-add-disk-create-storage.xml
index 7fd92ac4..7fd92ac4 100644
--- a/tests/data/clitest/compare/virt-xml-add-disk-create-storage.xml
+++ b/tests/data/cli/compare/virt-xml-add-disk-create-storage.xml
diff --git a/tests/data/clitest/compare/virt-xml-add-disk-default-storage.xml b/tests/data/cli/compare/virt-xml-add-disk-default-storage.xml
index 825468ff..825468ff 100644
--- a/tests/data/clitest/compare/virt-xml-add-disk-default-storage.xml
+++ b/tests/data/cli/compare/virt-xml-add-disk-default-storage.xml
diff --git a/tests/data/clitest/compare/virt-xml-add-disk-notarget.xml b/tests/data/cli/compare/virt-xml-add-disk-notarget.xml
index eb55c3b7..eb55c3b7 100644
--- a/tests/data/clitest/compare/virt-xml-add-disk-notarget.xml
+++ b/tests/data/cli/compare/virt-xml-add-disk-notarget.xml
diff --git a/tests/data/clitest/compare/virt-xml-add-host-device-start.xml b/tests/data/cli/compare/virt-xml-add-host-device-start.xml
index b3db5279..b3db5279 100644
--- a/tests/data/clitest/compare/virt-xml-add-host-device-start.xml
+++ b/tests/data/cli/compare/virt-xml-add-host-device-start.xml
diff --git a/tests/data/clitest/compare/virt-xml-add-host-device.xml b/tests/data/cli/compare/virt-xml-add-host-device.xml
index 099fe853..099fe853 100644
--- a/tests/data/clitest/compare/virt-xml-add-host-device.xml
+++ b/tests/data/cli/compare/virt-xml-add-host-device.xml
diff --git a/tests/data/clitest/compare/virt-xml-add-sound.xml b/tests/data/cli/compare/virt-xml-add-sound.xml
index 2d8911c6..2d8911c6 100644
--- a/tests/data/clitest/compare/virt-xml-add-sound.xml
+++ b/tests/data/cli/compare/virt-xml-add-sound.xml
diff --git a/tests/data/clitest/compare/virt-xml-build-blkiotune.xml b/tests/data/cli/compare/virt-xml-build-blkiotune.xml
index 09a13676..09a13676 100644
--- a/tests/data/clitest/compare/virt-xml-build-blkiotune.xml
+++ b/tests/data/cli/compare/virt-xml-build-blkiotune.xml
diff --git a/tests/data/clitest/compare/virt-xml-build-cpu.xml b/tests/data/cli/compare/virt-xml-build-cpu.xml
index 33ba979d..33ba979d 100644
--- a/tests/data/clitest/compare/virt-xml-build-cpu.xml
+++ b/tests/data/cli/compare/virt-xml-build-cpu.xml
diff --git a/tests/data/clitest/compare/virt-xml-build-disk-domain.xml b/tests/data/cli/compare/virt-xml-build-disk-domain.xml
index 76af6280..76af6280 100644
--- a/tests/data/clitest/compare/virt-xml-build-disk-domain.xml
+++ b/tests/data/cli/compare/virt-xml-build-disk-domain.xml
diff --git a/tests/data/clitest/compare/virt-xml-build-disk-plain.xml b/tests/data/cli/compare/virt-xml-build-disk-plain.xml
index ee17622a..ee17622a 100644
--- a/tests/data/clitest/compare/virt-xml-build-disk-plain.xml
+++ b/tests/data/cli/compare/virt-xml-build-disk-plain.xml
diff --git a/tests/data/clitest/compare/virt-xml-build-idmap.xml b/tests/data/cli/compare/virt-xml-build-idmap.xml
index e8f3317f..e8f3317f 100644
--- a/tests/data/clitest/compare/virt-xml-build-idmap.xml
+++ b/tests/data/cli/compare/virt-xml-build-idmap.xml
diff --git a/tests/data/clitest/compare/virt-xml-build-tpm.xml b/tests/data/cli/compare/virt-xml-build-tpm.xml
index 3c4ce2a7..3c4ce2a7 100644
--- a/tests/data/clitest/compare/virt-xml-build-tpm.xml
+++ b/tests/data/cli/compare/virt-xml-build-tpm.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-all.xml b/tests/data/cli/compare/virt-xml-edit-all.xml
index ed09effc..ed09effc 100644
--- a/tests/data/clitest/compare/virt-xml-edit-all.xml
+++ b/tests/data/cli/compare/virt-xml-edit-all.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-bootorder.xml b/tests/data/cli/compare/virt-xml-edit-bootorder.xml
index 0be579b4..0be579b4 100644
--- a/tests/data/clitest/compare/virt-xml-edit-bootorder.xml
+++ b/tests/data/cli/compare/virt-xml-edit-bootorder.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-clear-clock.xml b/tests/data/cli/compare/virt-xml-edit-clear-clock.xml
index c08613bb..c08613bb 100644
--- a/tests/data/clitest/compare/virt-xml-edit-clear-clock.xml
+++ b/tests/data/cli/compare/virt-xml-edit-clear-clock.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-clear-cpu.xml b/tests/data/cli/compare/virt-xml-edit-clear-cpu.xml
index 0afdc45c..0afdc45c 100644
--- a/tests/data/clitest/compare/virt-xml-edit-clear-cpu.xml
+++ b/tests/data/cli/compare/virt-xml-edit-clear-cpu.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-clear-disk.xml b/tests/data/cli/compare/virt-xml-edit-clear-disk.xml
index d0d6c8b3..d0d6c8b3 100644
--- a/tests/data/clitest/compare/virt-xml-edit-clear-disk.xml
+++ b/tests/data/cli/compare/virt-xml-edit-clear-disk.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-clearxml-qemu-commandline.xml b/tests/data/cli/compare/virt-xml-edit-clearxml-qemu-commandline.xml
index 354fe4af..354fe4af 100644
--- a/tests/data/clitest/compare/virt-xml-edit-clearxml-qemu-commandline.xml
+++ b/tests/data/cli/compare/virt-xml-edit-clearxml-qemu-commandline.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-disable-memballoon.xml b/tests/data/cli/compare/virt-xml-edit-disable-memballoon.xml
index e40396c2..e40396c2 100644
--- a/tests/data/clitest/compare/virt-xml-edit-disable-memballoon.xml
+++ b/tests/data/cli/compare/virt-xml-edit-disable-memballoon.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-disk-unset.xml b/tests/data/cli/compare/virt-xml-edit-disk-unset.xml
index 32d1d9c9..32d1d9c9 100644
--- a/tests/data/clitest/compare/virt-xml-edit-disk-unset.xml
+++ b/tests/data/cli/compare/virt-xml-edit-disk-unset.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-graphics-listen-none.xml b/tests/data/cli/compare/virt-xml-edit-graphics-listen-none.xml
index 275f4759..275f4759 100644
--- a/tests/data/clitest/compare/virt-xml-edit-graphics-listen-none.xml
+++ b/tests/data/cli/compare/virt-xml-edit-graphics-listen-none.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-graphics-spice-gl.xml b/tests/data/cli/compare/virt-xml-edit-graphics-spice-gl.xml
index 4656e313..4656e313 100644
--- a/tests/data/clitest/compare/virt-xml-edit-graphics-spice-gl.xml
+++ b/tests/data/cli/compare/virt-xml-edit-graphics-spice-gl.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-metadata-full-os.xml b/tests/data/cli/compare/virt-xml-edit-metadata-full-os.xml
index 5fbd3e07..5fbd3e07 100644
--- a/tests/data/clitest/compare/virt-xml-edit-metadata-full-os.xml
+++ b/tests/data/cli/compare/virt-xml-edit-metadata-full-os.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-neg-num.xml b/tests/data/cli/compare/virt-xml-edit-neg-num.xml
index c38e3e76..c38e3e76 100644
--- a/tests/data/clitest/compare/virt-xml-edit-neg-num.xml
+++ b/tests/data/cli/compare/virt-xml-edit-neg-num.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-pos-num.xml b/tests/data/cli/compare/virt-xml-edit-pos-num.xml
index 797ee720..797ee720 100644
--- a/tests/data/clitest/compare/virt-xml-edit-pos-num.xml
+++ b/tests/data/cli/compare/virt-xml-edit-pos-num.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder.xml
index 60114b99..60114b99 100644
--- a/tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder.xml
+++ b/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder2.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder2.xml
index 0c35cd14..0c35cd14 100644
--- a/tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder2.xml
+++ b/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder2.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-select-disk-path.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-path.xml
index 51bf9366..51bf9366 100644
--- a/tests/data/clitest/compare/virt-xml-edit-select-disk-path.xml
+++ b/tests/data/cli/compare/virt-xml-edit-select-disk-path.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-select-disk-target.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-target.xml
index 680bf90e..680bf90e 100644
--- a/tests/data/clitest/compare/virt-xml-edit-select-disk-target.xml
+++ b/tests/data/cli/compare/virt-xml-edit-select-disk-target.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-select-network-mac.xml b/tests/data/cli/compare/virt-xml-edit-select-network-mac.xml
index 80443076..80443076 100644
--- a/tests/data/clitest/compare/virt-xml-edit-select-network-mac.xml
+++ b/tests/data/cli/compare/virt-xml-edit-select-network-mac.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-select-sound-model.xml b/tests/data/cli/compare/virt-xml-edit-select-sound-model.xml
index 797ee720..797ee720 100644
--- a/tests/data/clitest/compare/virt-xml-edit-select-sound-model.xml
+++ b/tests/data/cli/compare/virt-xml-edit-select-sound-model.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-blkiotune.xml b/tests/data/cli/compare/virt-xml-edit-simple-blkiotune.xml
index 88faf6d6..88faf6d6 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-blkiotune.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-blkiotune.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-boot.xml b/tests/data/cli/compare/virt-xml-edit-simple-boot.xml
index 142a8c0d..142a8c0d 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-boot.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-boot.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-channel.xml b/tests/data/cli/compare/virt-xml-edit-simple-channel.xml
index f0e55914..f0e55914 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-channel.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-channel.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-clock.xml b/tests/data/cli/compare/virt-xml-edit-simple-clock.xml
index d660e7f6..d660e7f6 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-clock.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-clock.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-console.xml b/tests/data/cli/compare/virt-xml-edit-simple-console.xml
index c6f04c13..c6f04c13 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-console.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-console.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-controller.xml b/tests/data/cli/compare/virt-xml-edit-simple-controller.xml
index 12794d13..12794d13 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-controller.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-controller.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-cpu.xml b/tests/data/cli/compare/virt-xml-edit-simple-cpu.xml
index ce67f937..ce67f937 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-cpu.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-cpu.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-disk-remove-path.xml b/tests/data/cli/compare/virt-xml-edit-simple-disk-remove-path.xml
index b157b1d5..b157b1d5 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-disk-remove-path.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-disk-remove-path.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-disk.xml b/tests/data/cli/compare/virt-xml-edit-simple-disk.xml
index 782b326d..782b326d 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-disk.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-disk.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-events.xml b/tests/data/cli/compare/virt-xml-edit-simple-events.xml
index be2a4b66..be2a4b66 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-events.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-events.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-features.xml b/tests/data/cli/compare/virt-xml-edit-simple-features.xml
index eebe96df..eebe96df 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-features.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-features.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-filesystem.xml b/tests/data/cli/compare/virt-xml-edit-simple-filesystem.xml
index f7ccc6de..f7ccc6de 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-filesystem.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-filesystem.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-graphics.xml b/tests/data/cli/compare/virt-xml-edit-simple-graphics.xml
index 22176d87..22176d87 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-graphics.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-graphics.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-host-device.xml b/tests/data/cli/compare/virt-xml-edit-simple-host-device.xml
index 9359457d..9359457d 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-host-device.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-host-device.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-idmap.xml b/tests/data/cli/compare/virt-xml-edit-simple-idmap.xml
index 42916bb8..42916bb8 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-idmap.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-idmap.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-memballoon.xml b/tests/data/cli/compare/virt-xml-edit-simple-memballoon.xml
index e40396c2..e40396c2 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-memballoon.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-memballoon.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-memory.xml b/tests/data/cli/compare/virt-xml-edit-simple-memory.xml
index 89902c4c..89902c4c 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-memory.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-memory.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-metadata.xml b/tests/data/cli/compare/virt-xml-edit-simple-metadata.xml
index b40afcf2..b40afcf2 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-metadata.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-metadata.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-network.xml b/tests/data/cli/compare/virt-xml-edit-simple-network.xml
index c24b5a04..c24b5a04 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-network.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-network.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-numatune.xml b/tests/data/cli/compare/virt-xml-edit-simple-numatune.xml
index 9d63ca42..9d63ca42 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-numatune.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-numatune.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-parallel.xml b/tests/data/cli/compare/virt-xml-edit-simple-parallel.xml
index 2648cc07..2648cc07 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-parallel.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-parallel.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-pm.xml b/tests/data/cli/compare/virt-xml-edit-simple-pm.xml
index 3df18a31..3df18a31 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-pm.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-pm.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-qemu-commandline.xml b/tests/data/cli/compare/virt-xml-edit-simple-qemu-commandline.xml
index ff00f1a2..ff00f1a2 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-qemu-commandline.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-qemu-commandline.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-redirdev.xml b/tests/data/cli/compare/virt-xml-edit-simple-redirdev.xml
index 52ffddfe..52ffddfe 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-redirdev.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-redirdev.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-rng.xml b/tests/data/cli/compare/virt-xml-edit-simple-rng.xml
index 8d24e544..8d24e544 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-rng.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-rng.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-security.xml b/tests/data/cli/compare/virt-xml-edit-simple-security.xml
index d300f38b..d300f38b 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-security.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-security.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-serial.xml b/tests/data/cli/compare/virt-xml-edit-simple-serial.xml
index cbf49e02..cbf49e02 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-serial.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-serial.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-smartcard.xml b/tests/data/cli/compare/virt-xml-edit-simple-smartcard.xml
index 9eaf2377..9eaf2377 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-smartcard.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-smartcard.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-soundhw.xml b/tests/data/cli/compare/virt-xml-edit-simple-soundhw.xml
index 411e7918..411e7918 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-soundhw.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-soundhw.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-tpm.xml b/tests/data/cli/compare/virt-xml-edit-simple-tpm.xml
index 7cac1f45..7cac1f45 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-tpm.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-tpm.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-vcpus.xml b/tests/data/cli/compare/virt-xml-edit-simple-vcpus.xml
index e4d88442..e4d88442 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-vcpus.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-vcpus.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-video.xml b/tests/data/cli/compare/virt-xml-edit-simple-video.xml
index 6b7befca..6b7befca 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-video.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-video.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-vsock.xml b/tests/data/cli/compare/virt-xml-edit-simple-vsock.xml
index 4fea668c..4fea668c 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-vsock.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-vsock.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-watchdog.xml b/tests/data/cli/compare/virt-xml-edit-simple-watchdog.xml
index 314cbf3a..314cbf3a 100644
--- a/tests/data/clitest/compare/virt-xml-edit-simple-watchdog.xml
+++ b/tests/data/cli/compare/virt-xml-edit-simple-watchdog.xml
diff --git a/tests/data/clitest/compare/virt-xml-edit-video-virtio.xml b/tests/data/cli/compare/virt-xml-edit-video-virtio.xml
index 336df865..336df865 100644
--- a/tests/data/clitest/compare/virt-xml-edit-video-virtio.xml
+++ b/tests/data/cli/compare/virt-xml-edit-video-virtio.xml
diff --git a/tests/data/clitest/compare/virt-xml-hyperv-uefi-collision.xml b/tests/data/cli/compare/virt-xml-hyperv-uefi-collision.xml
index 12607a14..12607a14 100644
--- a/tests/data/clitest/compare/virt-xml-hyperv-uefi-collision.xml
+++ b/tests/data/cli/compare/virt-xml-hyperv-uefi-collision.xml
diff --git a/tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml b/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml
index 515919b0..515919b0 100644
--- a/tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml
+++ b/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml
diff --git a/tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-xml.xml b/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-xml.xml
index 4ee0f1cb..4ee0f1cb 100644
--- a/tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-xml.xml
+++ b/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-xml.xml
diff --git a/tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-cmdline.xml b/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-cmdline.xml
index 82644b32..82644b32 100644
--- a/tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-cmdline.xml
+++ b/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-cmdline.xml
diff --git a/tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-xml.xml b/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-xml.xml
index b5e1146f..b5e1146f 100644
--- a/tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-xml.xml
+++ b/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-xml.xml
diff --git a/tests/data/clitest/compare/virt-xml-print-xml.xml b/tests/data/cli/compare/virt-xml-print-xml.xml
index 8b43832a..8b43832a 100644
--- a/tests/data/clitest/compare/virt-xml-print-xml.xml
+++ b/tests/data/cli/compare/virt-xml-print-xml.xml
diff --git a/tests/data/clitest/compare/virt-xml-prompt-response.xml b/tests/data/cli/compare/virt-xml-prompt-response.xml
index 3eb4808e..3eb4808e 100644
--- a/tests/data/clitest/compare/virt-xml-prompt-response.xml
+++ b/tests/data/cli/compare/virt-xml-prompt-response.xml
diff --git a/tests/data/clitest/compare/virt-xml-remove-disk-index.xml b/tests/data/cli/compare/virt-xml-remove-disk-index.xml
index f0994381..f0994381 100644
--- a/tests/data/clitest/compare/virt-xml-remove-disk-index.xml
+++ b/tests/data/cli/compare/virt-xml-remove-disk-index.xml
diff --git a/tests/data/clitest/compare/virt-xml-remove-disk-path-start.xml b/tests/data/cli/compare/virt-xml-remove-disk-path-start.xml
index 06127f4b..06127f4b 100644
--- a/tests/data/clitest/compare/virt-xml-remove-disk-path-start.xml
+++ b/tests/data/cli/compare/virt-xml-remove-disk-path-start.xml
diff --git a/tests/data/clitest/compare/virt-xml-remove-disk-path.xml b/tests/data/cli/compare/virt-xml-remove-disk-path.xml
index a3313cb7..a3313cb7 100644
--- a/tests/data/clitest/compare/virt-xml-remove-disk-path.xml
+++ b/tests/data/cli/compare/virt-xml-remove-disk-path.xml
diff --git a/tests/data/clitest/compare/virt-xml-remove-hostdev-name.xml b/tests/data/cli/compare/virt-xml-remove-hostdev-name.xml
index f0c19062..f0c19062 100644
--- a/tests/data/clitest/compare/virt-xml-remove-hostdev-name.xml
+++ b/tests/data/cli/compare/virt-xml-remove-hostdev-name.xml
diff --git a/tests/data/clitest/compare/virt-xml-remove-memballoon.xml b/tests/data/cli/compare/virt-xml-remove-memballoon.xml
index 42ed467b..42ed467b 100644
--- a/tests/data/clitest/compare/virt-xml-remove-memballoon.xml
+++ b/tests/data/cli/compare/virt-xml-remove-memballoon.xml
diff --git a/tests/data/clitest/compare/virt-xml-remove-sound-model.xml b/tests/data/cli/compare/virt-xml-remove-sound-model.xml
index d80497eb..d80497eb 100644
--- a/tests/data/clitest/compare/virt-xml-remove-sound-model.xml
+++ b/tests/data/cli/compare/virt-xml-remove-sound-model.xml
diff --git a/tests/data/clitest/compare/virt-xml-remove-video-all.xml b/tests/data/cli/compare/virt-xml-remove-video-all.xml
index 781531ee..781531ee 100644
--- a/tests/data/clitest/compare/virt-xml-remove-video-all.xml
+++ b/tests/data/cli/compare/virt-xml-remove-video-all.xml
diff --git a/tests/data/clitest/compare/virt-xml-start-select-disk-bootorder.xml b/tests/data/cli/compare/virt-xml-start-select-disk-bootorder.xml
index bd29f059..bd29f059 100644
--- a/tests/data/clitest/compare/virt-xml-start-select-disk-bootorder.xml
+++ b/tests/data/cli/compare/virt-xml-start-select-disk-bootorder.xml
diff --git a/tests/data/clitest/compare/virt-xml-start-select-disk-bootorder2.xml b/tests/data/cli/compare/virt-xml-start-select-disk-bootorder2.xml
index 777044b2..777044b2 100644
--- a/tests/data/clitest/compare/virt-xml-start-select-disk-bootorder2.xml
+++ b/tests/data/cli/compare/virt-xml-start-select-disk-bootorder2.xml
diff --git a/tests/data/clitest/compare/virt-xml-stdin-edit.xml b/tests/data/cli/compare/virt-xml-stdin-edit.xml
index 834755f1..834755f1 100644
--- a/tests/data/clitest/compare/virt-xml-stdin-edit.xml
+++ b/tests/data/cli/compare/virt-xml-stdin-edit.xml
diff --git a/tests/data/clitest/fake-centos65-label.iso b/tests/data/cli/fake-centos65-label.iso
index c1899b2e..c1899b2e 100755
--- a/tests/data/clitest/fake-centos65-label.iso
+++ b/tests/data/cli/fake-centos65-label.iso
diff --git a/tests/data/clitest/fake-f26-netinst.iso b/tests/data/cli/fake-f26-netinst.iso
index 2d2b748f..2d2b748f 100755
--- a/tests/data/clitest/fake-f26-netinst.iso
+++ b/tests/data/cli/fake-f26-netinst.iso
diff --git a/tests/data/clitest/fake-f29-live.iso b/tests/data/cli/fake-f29-live.iso
index 71c27258..71c27258 100755
--- a/tests/data/clitest/fake-f29-live.iso
+++ b/tests/data/cli/fake-f29-live.iso
diff --git a/tests/data/clitest/fake-fedora17-tree.iso b/tests/data/cli/fake-fedora17-tree.iso
index 2e729a65..2e729a65 100755
--- a/tests/data/clitest/fake-fedora17-tree.iso
+++ b/tests/data/cli/fake-fedora17-tree.iso
diff --git a/tests/data/clitest/fake-no-osinfo.iso b/tests/data/cli/fake-no-osinfo.iso
index 4cf9c553..4cf9c553 100755
--- a/tests/data/clitest/fake-no-osinfo.iso
+++ b/tests/data/cli/fake-no-osinfo.iso
diff --git a/tests/data/clitest/fake-win7.iso b/tests/data/cli/fake-win7.iso
index 2bfe75cd..2bfe75cd 100755
--- a/tests/data/clitest/fake-win7.iso
+++ b/tests/data/cli/fake-win7.iso
diff --git a/tests/data/clitest/fakefedoratree/.treeinfo b/tests/data/cli/fakefedoratree/.treeinfo
index 9bbee18f..9bbee18f 100644
--- a/tests/data/clitest/fakefedoratree/.treeinfo
+++ b/tests/data/cli/fakefedoratree/.treeinfo
diff --git a/tests/data/clitest/fakefedoratree/images/boot.iso b/tests/data/cli/fakefedoratree/images/boot.iso
index 7fcf7ba3..7fcf7ba3 100644
--- a/tests/data/clitest/fakefedoratree/images/boot.iso
+++ b/tests/data/cli/fakefedoratree/images/boot.iso
diff --git a/tests/data/clitest/fakefedoratree/images/pxeboot/initrd.img b/tests/data/cli/fakefedoratree/images/pxeboot/initrd.img
index 0f3339f2..0f3339f2 100644
--- a/tests/data/clitest/fakefedoratree/images/pxeboot/initrd.img
+++ b/tests/data/cli/fakefedoratree/images/pxeboot/initrd.img
diff --git a/tests/data/clitest/fakefedoratree/images/pxeboot/vmlinuz b/tests/data/cli/fakefedoratree/images/pxeboot/vmlinuz
index fa797a2f..fa797a2f 100644
--- a/tests/data/clitest/fakefedoratree/images/pxeboot/vmlinuz
+++ b/tests/data/cli/fakefedoratree/images/pxeboot/vmlinuz
diff --git a/tests/data/clitest/fakefedoratree/images/xen/initrd.img b/tests/data/cli/fakefedoratree/images/xen/initrd.img
index 0f3339f2..0f3339f2 100644
--- a/tests/data/clitest/fakefedoratree/images/xen/initrd.img
+++ b/tests/data/cli/fakefedoratree/images/xen/initrd.img
diff --git a/tests/data/clitest/fakefedoratree/images/xen/vmlinuz b/tests/data/cli/fakefedoratree/images/xen/vmlinuz
index fa797a2f..fa797a2f 100644
--- a/tests/data/clitest/fakefedoratree/images/xen/vmlinuz
+++ b/tests/data/cli/fakefedoratree/images/xen/vmlinuz
diff --git a/tests/data/clitest/fakerhel6tree/.treeinfo b/tests/data/cli/fakerhel6tree/.treeinfo
index 8b328e73..8b328e73 100644
--- a/tests/data/clitest/fakerhel6tree/.treeinfo
+++ b/tests/data/cli/fakerhel6tree/.treeinfo
diff --git a/tests/data/clitest/fakerhel6tree/images/boot.iso b/tests/data/cli/fakerhel6tree/images/boot.iso
index 7fcf7ba3..7fcf7ba3 100644
--- a/tests/data/clitest/fakerhel6tree/images/boot.iso
+++ b/tests/data/cli/fakerhel6tree/images/boot.iso
diff --git a/tests/data/clitest/fakerhel6tree/images/pxeboot/initrd.img b/tests/data/cli/fakerhel6tree/images/pxeboot/initrd.img
index 0f3339f2..0f3339f2 100644
--- a/tests/data/clitest/fakerhel6tree/images/pxeboot/initrd.img
+++ b/tests/data/cli/fakerhel6tree/images/pxeboot/initrd.img
diff --git a/tests/data/clitest/fakerhel6tree/images/pxeboot/vmlinuz b/tests/data/cli/fakerhel6tree/images/pxeboot/vmlinuz
index fa797a2f..fa797a2f 100644
--- a/tests/data/clitest/fakerhel6tree/images/pxeboot/vmlinuz
+++ b/tests/data/cli/fakerhel6tree/images/pxeboot/vmlinuz
diff --git a/tests/data/clitest/fakerhel6tree/images/xen/initrd.img b/tests/data/cli/fakerhel6tree/images/xen/initrd.img
index 0f3339f2..0f3339f2 100644
--- a/tests/data/clitest/fakerhel6tree/images/xen/initrd.img
+++ b/tests/data/cli/fakerhel6tree/images/xen/initrd.img
diff --git a/tests/data/clitest/fakerhel6tree/images/xen/vmlinuz b/tests/data/cli/fakerhel6tree/images/xen/vmlinuz
index fa797a2f..fa797a2f 100644
--- a/tests/data/clitest/fakerhel6tree/images/xen/vmlinuz
+++ b/tests/data/cli/fakerhel6tree/images/xen/vmlinuz
diff --git a/tests/data/clitest/testdriver-defaultpool-collision.xml b/tests/data/cli/testdriver-defaultpool-collision.xml
index 1343f812..1343f812 100644
--- a/tests/data/clitest/testdriver-defaultpool-collision.xml
+++ b/tests/data/cli/testdriver-defaultpool-collision.xml
diff --git a/tests/data/clitest/user-password.txt b/tests/data/cli/user-password.txt
index 625999ba..625999ba 100644
--- a/tests/data/clitest/user-password.txt
+++ b/tests/data/cli/user-password.txt
diff --git a/tests/data/clitest/virtxml-qemu-commandline-clear.xml b/tests/data/cli/virtxml-qemu-commandline-clear.xml
index 40039412..40039412 100644
--- a/tests/data/clitest/virtxml-qemu-commandline-clear.xml
+++ b/tests/data/cli/virtxml-qemu-commandline-clear.xml
diff --git a/tests/data/clitest/virtxml-stdin-edit.xml b/tests/data/cli/virtxml-stdin-edit.xml
index 4a7b3e32..4a7b3e32 100644
--- a/tests/data/clitest/virtxml-stdin-edit.xml
+++ b/tests/data/cli/virtxml-stdin-edit.xml
diff --git a/tests/capabilities.py b/tests/test_capabilities.py
index d2548267..d2548267 100644
--- a/tests/capabilities.py
+++ b/tests/test_capabilities.py
diff --git a/tests/checkprops.py b/tests/test_checkprops.py
index f2a5d499..1ccb254b 100644
--- a/tests/checkprops.py
+++ b/tests/test_checkprops.py
@@ -55,7 +55,7 @@ class CheckPropsTest(unittest.TestCase):
                     "untested in the test suite. This could be caused\n"
                     "by a previous test suite failure, or if you added\n"
                     "a new property and didn't extend the test suite.\n"
-                    "Look into extending clitest.py and/or xmlparse.py.")
+                    "Look into extending test_cli.py and/or test_xmlparse.py.")
 
         if msg:
             self.fail(msg)
diff --git a/tests/clitest.py b/tests/test_cli.py
index 6be56750..89e8574b 100644
--- a/tests/clitest.py
+++ b/tests/test_cli.py
@@ -30,7 +30,7 @@ os.environ["HOME"] = "/tmp"
 os.environ["DISPLAY"] = ":3.4"
 
 TMP_IMAGE_DIR = "/tmp/__virtinst_cli_"
-XMLDIR = "tests/data/clitest"
+XMLDIR = "tests/data/cli"
 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/data/clitest/compare/
+#              in tests/data/cli/compare/
 #
 
 ######################
diff --git a/tests/clonetest.py b/tests/test_cloner.py
index cad852a1..cad852a1 100644
--- a/tests/clonetest.py
+++ b/tests/test_cloner.py
diff --git a/tests/dist.py b/tests/test_dist.py
index b1dac02b..b1dac02b 100644
--- a/tests/dist.py
+++ b/tests/test_dist.py
diff --git a/tests/nodedev.py b/tests/test_nodedev.py
index f22516e3..f22516e3 100644
--- a/tests/nodedev.py
+++ b/tests/test_nodedev.py
diff --git a/tests/osdict.py b/tests/test_osdict.py
index 1f10aaa6..1f10aaa6 100644
--- a/tests/osdict.py
+++ b/tests/test_osdict.py
diff --git a/tests/storage.py b/tests/test_storage.py
index 472fc475..472fc475 100644
--- a/tests/storage.py
+++ b/tests/test_storage.py
diff --git a/tests/uriparse.py b/tests/test_uriparse.py
index 8fb6b003..8fb6b003 100644
--- a/tests/uriparse.py
+++ b/tests/test_uriparse.py
diff --git a/tests/xmlconfig.py b/tests/test_xmlconfig.py
index b92a7d86..dccc6a17 100644
--- a/tests/xmlconfig.py
+++ b/tests/test_xmlconfig.py
@@ -61,7 +61,7 @@ class TestXMLMisc(unittest.TestCase):
     """
     Misc tests for various XML special behavior. These should only aim for
     testing any particularly tricky bits, general XML generation should
-    be through virt-install examples in clitest
+    be through virt-install examples in test_cli
     """
     @property
     def conn(self):
@@ -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/data/clitest/fakefedoratree")
+            location="tests/data/cli/fakefedoratree")
         g = _make_guest()
         v = i.detect_distro(g)
         self.assertEqual(v, "fedora17")
 
         i = _make_installer(
-            location="tests/data/clitest/fakerhel6tree")
+            location="tests/data/cli/fakerhel6tree")
         g = _make_guest()
         v = i.detect_distro(g)
         self.assertEqual(v, "rhel6.0")
diff --git a/tests/xmlparse.py b/tests/test_xmlparse.py
index ca97f0c0..ca97f0c0 100644
--- a/tests/xmlparse.py
+++ b/tests/test_xmlparse.py
diff --git a/tests/uitests/about.py b/tests/uitests/test_about.py
index aadfc71b..aadfc71b 100644
--- a/tests/uitests/about.py
+++ b/tests/uitests/test_about.py
diff --git a/tests/uitests/addhardware.py b/tests/uitests/test_addhardware.py
index afaf5092..afaf5092 100644
--- a/tests/uitests/addhardware.py
+++ b/tests/uitests/test_addhardware.py
diff --git a/tests/uitests/cli.py b/tests/uitests/test_cli.py
index bd96465c..bd96465c 100644
--- a/tests/uitests/cli.py
+++ b/tests/uitests/test_cli.py
diff --git a/tests/uitests/clonevm.py b/tests/uitests/test_clonevm.py
index ac62f4ea..ac62f4ea 100644
--- a/tests/uitests/clonevm.py
+++ b/tests/uitests/test_clonevm.py
diff --git a/tests/uitests/connect.py b/tests/uitests/test_connect.py
index 62db144b..62db144b 100644
--- a/tests/uitests/connect.py
+++ b/tests/uitests/test_connect.py
diff --git a/tests/uitests/createnet.py b/tests/uitests/test_createnet.py
index fcf204b4..fcf204b4 100644
--- a/tests/uitests/createnet.py
+++ b/tests/uitests/test_createnet.py
diff --git a/tests/uitests/createpool.py b/tests/uitests/test_createpool.py
index 2a713d54..2a713d54 100644
--- a/tests/uitests/createpool.py
+++ b/tests/uitests/test_createpool.py
diff --git a/tests/uitests/createvol.py b/tests/uitests/test_createvol.py
index 1f10bfb7..1f10bfb7 100644
--- a/tests/uitests/createvol.py
+++ b/tests/uitests/test_createvol.py
diff --git a/tests/uitests/details.py b/tests/uitests/test_details.py
index 3dfc70dc..3dfc70dc 100644
--- a/tests/uitests/details.py
+++ b/tests/uitests/test_details.py
diff --git a/tests/uitests/host.py b/tests/uitests/test_host.py
index ea1c6781..ea1c6781 100644
--- a/tests/uitests/host.py
+++ b/tests/uitests/test_host.py
diff --git a/tests/uitests/livetests.py b/tests/uitests/test_livetests.py
index d81ea415..d81ea415 100644
--- a/tests/uitests/livetests.py
+++ b/tests/uitests/test_livetests.py
diff --git a/tests/uitests/manager.py b/tests/uitests/test_manager.py
index 54e3538a..54e3538a 100644
--- a/tests/uitests/manager.py
+++ b/tests/uitests/test_manager.py
diff --git a/tests/uitests/mediachange.py b/tests/uitests/test_mediachange.py
index 8b6991c6..8b6991c6 100644
--- a/tests/uitests/mediachange.py
+++ b/tests/uitests/test_mediachange.py
diff --git a/tests/uitests/migrate.py b/tests/uitests/test_migrate.py
index d15ab20c..d15ab20c 100644
--- a/tests/uitests/migrate.py
+++ b/tests/uitests/test_migrate.py
diff --git a/tests/uitests/newvm.py b/tests/uitests/test_newvm.py
index 06e9e57c..06e9e57c 100644
--- a/tests/uitests/newvm.py
+++ b/tests/uitests/test_newvm.py
diff --git a/tests/uitests/prefs.py b/tests/uitests/test_prefs.py
index dfd42b89..dfd42b89 100644
--- a/tests/uitests/prefs.py
+++ b/tests/uitests/test_prefs.py
diff --git a/tests/uitests/snapshot.py b/tests/uitests/test_snapshot.py
index e8e9d6cf..e8e9d6cf 100644
--- a/tests/uitests/snapshot.py
+++ b/tests/uitests/test_snapshot.py
diff --git a/tests/utils.py b/tests/utils.py
index b25c322a..43fe1586 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -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/data/clitest/testdriver-defaultpool-collision.xml"))
+            "/tests/data/cli/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/virtinst/buildconfig.py b/virtinst/buildconfig.py
index d19e7dda..b3468481 100644
--- a/virtinst/buildconfig.py
+++ b/virtinst/buildconfig.py
@@ -29,7 +29,7 @@ if os.path.exists(_cfgpath):
 
 _istest = "VIRTINST_TEST_SUITE" in os.environ
 _running_from_srcdir = os.path.exists(
-    os.path.join(_srcdir, "tests", "clitest.py"))
+    os.path.join(_srcdir, "tests", "test_cli.py"))
 
 
 def _split_list(commastr):
diff --git a/virtinst/install/urlfetcher.py b/virtinst/install/urlfetcher.py
index fe5c5d7e..b3f54353 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/data/clitest/fakerhel6tree/.treeinfo" %
+        fn = ("%s/../../tests/data/cli/fakerhel6tree/.treeinfo" %
                 os.path.abspath(os.path.dirname(__file__)))
         abspath = os.path.abspath(fn)
     else: