diff --git a/tests/cli-test-xml/meta-data.txt b/tests/cli-test-xml/cloudinit/meta-data.txt
similarity index 100%
rename from tests/cli-test-xml/meta-data.txt
rename to tests/cli-test-xml/cloudinit/meta-data.txt
diff --git a/tests/cli-test-xml/ssh-key.txt b/tests/cli-test-xml/cloudinit/ssh-key.txt
similarity index 100%
rename from tests/cli-test-xml/ssh-key.txt
rename to tests/cli-test-xml/cloudinit/ssh-key.txt
diff --git a/tests/cli-test-xml/user-data.txt b/tests/cli-test-xml/cloudinit/user-data.txt
similarity index 100%
rename from tests/cli-test-xml/user-data.txt
rename to tests/cli-test-xml/cloudinit/user-data.txt
diff --git a/tests/clitest.py b/tests/clitest.py
index b488abf51..6ee7fc424 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -64,6 +64,7 @@ test_files = {
     'URI-KVM-S390X': utils.URIs.kvm_s390x,
     'URI-QEMU-RISCV64': utils.URIs.qemu_riscv64,
 
+    'XMLDIR': XMLDIR,
     'NEWIMG1': "/dev/default-pool/new1.img",
     'NEWIMG2': "/dev/default-pool/new2.img",
     'NEWCLONEIMG1': new_images[0],
@@ -83,9 +84,6 @@ test_files = {
     'COLLIDE': "/dev/default-pool/collidevol1.img",
     'ADMIN-PASSWORD-FILE': "%s/admin-password.txt" % XMLDIR,
     'USER-PASSWORD-FILE': "%s/user-password.txt" % XMLDIR,
-    'SSH-KEY-FILE': "%s/ssh-key.txt" % XMLDIR,
-    'USER-DATA-FILE': "%s/user-data.txt" % XMLDIR,
-    'META-DATA-FILE': "%s/meta-data.txt" % XMLDIR,
 }
 
 
@@ -879,8 +877,8 @@ c.add_compare("--connect %s --os-variant fedora26 --pxe --print-xml" % (utils.UR
 c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init", "cloud-init-default")  # default --cloud-init behavior is root-password-generate=yes,disable=yes
 c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init root-password-generate=yes,disable=no", "cloud-init-options")  # --cloud-init root-password-generate
 c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init root-password-file=%(ADMIN-PASSWORD-FILE)s,disable=no", "cloud-init-options")  # --cloud-init root-password-file
-c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init ssh-key=%(SSH-KEY-FILE)s", "cloud-init-options")  # --cloud-init ssh-key
-c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init user-data=%(USER-DATA-FILE)s,meta-data=%(META-DATA-FILE)s", "cloud-init-options")  # --cloud-init user-data=,meta-data=
+c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init ssh-key=%(XMLDIR)s/cloudinit/ssh-key.txt", "cloud-init-options")  # --cloud-init ssh-key
+c.add_compare("--disk %(EXISTIMG1)s --os-variant fedora28 --cloud-init user-data=%(XMLDIR)s/cloudinit/user-data.txt,meta-data=%(XMLDIR)s/cloudinit/meta-data.txt", "cloud-init-options")  # --cloud-init user-data=,meta-data=
 c.add_valid("--panic help --disk=? --check=help", grep="path_in_use")  # Make sure introspection doesn't blow up
 c.add_valid("--connect test:///default --test-stub-command", use_default_args=False)  # --test-stub-command
 c.add_valid("--nodisks --pxe", grep="VM performance may suffer")  # os variant warning