diff --git a/tests/Makefile.am b/tests/Makefile.am
index a9acd88670996d9099cff435996e66734d231eec..10a309bd765e9e2b4f827a6d883fd3a70812a938 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -89,7 +89,7 @@ EXTRA_DIST = \
 	capabilityschemadata \
 	commanddata \
 	cputestdata \
-	domaincapsschemadata \
+	domaincapsdata \
 	domainconfdata \
 	domainschemadata \
 	fchostdata \
diff --git a/tests/domaincapsschemadata/bhyve_basic.x86_64.xml b/tests/domaincapsdata/bhyve_basic.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/bhyve_basic.x86_64.xml
rename to tests/domaincapsdata/bhyve_basic.x86_64.xml
diff --git a/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml b/tests/domaincapsdata/bhyve_fbuf.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml
rename to tests/domaincapsdata/bhyve_fbuf.x86_64.xml
diff --git a/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml b/tests/domaincapsdata/bhyve_uefi.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/bhyve_uefi.x86_64.xml
rename to tests/domaincapsdata/bhyve_uefi.x86_64.xml
diff --git a/tests/domaincapsschemadata/empty.xml b/tests/domaincapsdata/empty.xml
similarity index 100%
rename from tests/domaincapsschemadata/empty.xml
rename to tests/domaincapsdata/empty.xml
diff --git a/tests/domaincapsschemadata/libxl-xenfv.xml b/tests/domaincapsdata/libxl-xenfv.xml
similarity index 100%
rename from tests/domaincapsschemadata/libxl-xenfv.xml
rename to tests/domaincapsdata/libxl-xenfv.xml
diff --git a/tests/domaincapsschemadata/libxl-xenpv.xml b/tests/domaincapsdata/libxl-xenpv.xml
similarity index 100%
rename from tests/domaincapsschemadata/libxl-xenpv.xml
rename to tests/domaincapsdata/libxl-xenpv.xml
diff --git a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml b/tests/domaincapsdata/qemu_1.7.0.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml
rename to tests/domaincapsdata/qemu_1.7.0.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml
rename to tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml
rename to tests/domaincapsdata/qemu_2.12.0.ppc64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
rename to tests/domaincapsdata/qemu_2.12.0.s390x.xml
diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
rename to tests/domaincapsdata/qemu_2.12.0.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml
rename to tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml b/tests/domaincapsdata/qemu_2.6.0.aarch64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
rename to tests/domaincapsdata/qemu_2.6.0.aarch64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml b/tests/domaincapsdata/qemu_2.6.0.ppc64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml
rename to tests/domaincapsdata/qemu_2.6.0.ppc64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml b/tests/domaincapsdata/qemu_2.6.0.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
rename to tests/domaincapsdata/qemu_2.6.0.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml b/tests/domaincapsdata/qemu_2.7.0.s390x.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
rename to tests/domaincapsdata/qemu_2.7.0.s390x.xml
diff --git a/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml
rename to tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml b/tests/domaincapsdata/qemu_2.8.0.s390x.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
rename to tests/domaincapsdata/qemu_2.8.0.s390x.xml
diff --git a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml b/tests/domaincapsdata/qemu_2.8.0.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml
rename to tests/domaincapsdata/qemu_2.8.0.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml
rename to tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
rename to tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml b/tests/domaincapsdata/qemu_2.9.0.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml
rename to tests/domaincapsdata/qemu_2.9.0.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_3.0.0.s390x.xml
rename to tests/domaincapsdata/qemu_3.0.0.s390x.xml
diff --git a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
rename to tests/domaincapsdata/qemu_3.1.0.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_4.0.0.s390x.xml b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_4.0.0.s390x.xml
rename to tests/domaincapsdata/qemu_4.0.0.s390x.xml
diff --git a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
rename to tests/domaincapsdata/qemu_4.0.0.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
rename to tests/domaincapsdata/qemu_4.1.0.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_4.2.0.aarch64.xml
rename to tests/domaincapsdata/qemu_4.2.0.aarch64.xml
diff --git a/tests/domaincapsschemadata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_4.2.0.ppc64.xml
rename to tests/domaincapsdata/qemu_4.2.0.ppc64.xml
diff --git a/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml
rename to tests/domaincapsdata/qemu_4.2.0.x86_64.xml
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 61bc019671700e40a96b518ecf9d30e0435c2e86..7a69543a45524ca7f5d8e5b471024255e1552035 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -217,7 +217,7 @@ test_virDomainCapsFormat(const void *opaque)
     char *domCapsXML = NULL;
     int ret = -1;
 
-    if (virAsprintf(&path, "%s/domaincapsschemadata/%s.xml",
+    if (virAsprintf(&path, "%s/domaincapsdata/%s.xml",
                     abs_srcdir, data->name) < 0)
         goto cleanup;
 
diff --git a/tests/virschematest.c b/tests/virschematest.c
index dabbc02163a909d7d5097a0471ce54bf41f68821..050da0c972f1a449ad4018c0fd5f6cc2de6dcbc4 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -221,7 +221,7 @@ mymain(void)
                 "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindata",
                 "genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconfigdata",
                 "qemuhotplugtestdomains");
-    DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata");
+    DO_TEST_DIR("domaincaps.rng", "domaincapsdata");
     DO_TEST_DIR("domaincheckpoint.rng", "qemudomaincheckpointxml2xmlin",
                 "qemudomaincheckpointxml2xmlout");
     DO_TEST_DIR("domainsnapshot.rng", "qemudomainsnapshotxml2xmlin",