diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index b4ed081d3e..16c2832ffb 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -179,8 +179,9 @@ testQemuCapsCopy(const void *opaque)
 static int
 doCapsTest(const char *base,
            const char *archName,
-           testQemuDataPtr data)
+           void *opaque)
 {
+    testQemuDataPtr data = (testQemuDataPtr) opaque;
     VIR_AUTOFREE(char *) title = NULL;
     VIR_AUTOFREE(char *) copyTitle = NULL;
 
@@ -220,49 +221,8 @@ mymain(void)
     if (testQemuDataInit(&data) < 0)
         return EXIT_FAILURE;
 
-#define DO_TEST(arch, name) \
-    do { \
-        if (doCapsTest(name, arch, &data) < 0) \
-            return EXIT_FAILURE; \
-    } while (0)
-
-    /* Keep this in sync with qemucaps2xmltest */
-    DO_TEST("x86_64", "caps_1.5.3");
-    DO_TEST("x86_64", "caps_1.6.0");
-    DO_TEST("x86_64", "caps_1.7.0");
-    DO_TEST("x86_64", "caps_2.1.1");
-    DO_TEST("x86_64", "caps_2.4.0");
-    DO_TEST("x86_64", "caps_2.5.0");
-    DO_TEST("x86_64", "caps_2.6.0");
-    DO_TEST("x86_64", "caps_2.7.0");
-    DO_TEST("x86_64", "caps_2.8.0");
-    DO_TEST("x86_64", "caps_2.9.0");
-    DO_TEST("x86_64", "caps_2.10.0");
-    DO_TEST("x86_64", "caps_2.11.0");
-    DO_TEST("x86_64", "caps_2.12.0");
-    DO_TEST("x86_64", "caps_3.0.0");
-    DO_TEST("x86_64", "caps_3.1.0");
-    DO_TEST("x86_64", "caps_4.0.0");
-    DO_TEST("aarch64", "caps_2.6.0");
-    DO_TEST("aarch64", "caps_2.10.0");
-    DO_TEST("aarch64", "caps_2.12.0");
-    DO_TEST("ppc64", "caps_2.6.0");
-    DO_TEST("ppc64", "caps_2.9.0");
-    DO_TEST("ppc64", "caps_2.10.0");
-    DO_TEST("ppc64", "caps_2.12.0");
-    DO_TEST("ppc64", "caps_3.0.0");
-    DO_TEST("ppc64", "caps_3.1.0");
-    DO_TEST("s390x", "caps_2.7.0");
-    DO_TEST("s390x", "caps_2.8.0");
-    DO_TEST("s390x", "caps_2.9.0");
-    DO_TEST("s390x", "caps_2.10.0");
-    DO_TEST("s390x", "caps_2.11.0");
-    DO_TEST("s390x", "caps_2.12.0");
-    DO_TEST("s390x", "caps_3.0.0");
-    DO_TEST("riscv32", "caps_3.0.0");
-    DO_TEST("riscv32", "caps_4.0.0");
-    DO_TEST("riscv64", "caps_3.0.0");
-    DO_TEST("riscv64", "caps_4.0.0");
+    if (testQemuCapsIterate(data.dataDir, ".replies", doCapsTest, &data) < 0)
+        return EXIT_FAILURE;
 
     /*
      * Run "tests/qemucapsprobe /path/to/qemu/binary >foo.replies"
diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index 49e899c0c1..7d3c768bfd 100644
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -177,8 +177,9 @@ testQemuCapsXML(const void *opaque)
 static int
 doCapsTest(const char *base,
            const char *archName,
-           testQemuDataPtr data)
+           void *opaque)
 {
+    testQemuDataPtr data = (testQemuDataPtr) opaque;
     VIR_AUTOFREE(char *) title = NULL;
 
     if (virAsprintf(&title, "%s (%s)", base, archName) < 0)
@@ -211,49 +212,8 @@ mymain(void)
     if (testQemuDataInit(&data) < 0)
         return EXIT_FAILURE;
 
-#define DO_TEST(arch, name) \
-    do { \
-        if (doCapsTest(name, arch, &data) < 0) \
-            return EXIT_FAILURE; \
-    } while (0)
-
-    /* Keep this in sync with qemucapabilitiestest */
-    DO_TEST("x86_64", "caps_1.5.3");
-    DO_TEST("x86_64", "caps_1.6.0");
-    DO_TEST("x86_64", "caps_1.7.0");
-    DO_TEST("x86_64", "caps_2.1.1");
-    DO_TEST("x86_64", "caps_2.4.0");
-    DO_TEST("x86_64", "caps_2.5.0");
-    DO_TEST("x86_64", "caps_2.6.0");
-    DO_TEST("x86_64", "caps_2.7.0");
-    DO_TEST("x86_64", "caps_2.8.0");
-    DO_TEST("x86_64", "caps_2.9.0");
-    DO_TEST("x86_64", "caps_2.10.0");
-    DO_TEST("x86_64", "caps_2.11.0");
-    DO_TEST("x86_64", "caps_2.12.0");
-    DO_TEST("x86_64", "caps_3.0.0");
-    DO_TEST("x86_64", "caps_3.1.0");
-    DO_TEST("x86_64", "caps_4.0.0");
-    DO_TEST("aarch64", "caps_2.6.0");
-    DO_TEST("aarch64", "caps_2.10.0");
-    DO_TEST("aarch64", "caps_2.12.0");
-    DO_TEST("ppc64", "caps_2.6.0");
-    DO_TEST("ppc64", "caps_2.9.0");
-    DO_TEST("ppc64", "caps_2.10.0");
-    DO_TEST("ppc64", "caps_2.12.0");
-    DO_TEST("ppc64", "caps_3.0.0");
-    DO_TEST("ppc64", "caps_3.1.0");
-    DO_TEST("s390x", "caps_2.7.0");
-    DO_TEST("s390x", "caps_2.8.0");
-    DO_TEST("s390x", "caps_2.9.0");
-    DO_TEST("s390x", "caps_2.10.0");
-    DO_TEST("s390x", "caps_2.11.0");
-    DO_TEST("s390x", "caps_2.12.0");
-    DO_TEST("s390x", "caps_3.0.0");
-    DO_TEST("riscv32", "caps_3.0.0");
-    DO_TEST("riscv32", "caps_4.0.0");
-    DO_TEST("riscv64", "caps_3.0.0");
-    DO_TEST("riscv64", "caps_4.0.0");
+    if (testQemuCapsIterate(data.inputDir, ".xml", doCapsTest, &data) < 0)
+        return EXIT_FAILURE;
 
     return (data.ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }