diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index ecebc82187..3436197d97 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -286,27 +286,27 @@ mymain(void)
 
 #if WITH_QEMU
 
-    DO_TEST_QEMU("1.6.50", "caps_1.6.50-1",
+    DO_TEST_QEMU("1.6.50", "caps_1.6.50",
                  "/usr/bin/qemu-system-x86_64", NULL,
                  "x86_64", VIR_DOMAIN_VIRT_KVM);
 
-    DO_TEST_QEMU("2.6.0", "caps_2.6.0-1",
+    DO_TEST_QEMU("2.6.0", "caps_2.6.0",
                  "/usr/bin/qemu-system-x86_64", NULL,
                  "x86_64", VIR_DOMAIN_VIRT_KVM);
 
-    DO_TEST_QEMU("2.6.0", "caps_2.6.0-1",
+    DO_TEST_QEMU("2.6.0", "caps_2.6.0-gicv2",
                  "/usr/bin/qemu-system-aarch64", NULL,
                  "aarch64", VIR_DOMAIN_VIRT_KVM);
 
-    DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-1",
+    DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-gicv2",
                  "/usr/bin/qemu-system-aarch64", "virt",
                  "aarch64", VIR_DOMAIN_VIRT_KVM);
 
-    DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-2",
+    DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-gicv3",
                  "/usr/bin/qemu-system-aarch64", "virt",
                  "aarch64", VIR_DOMAIN_VIRT_KVM);
 
-    DO_TEST_QEMU("2.6.0", "caps_2.6.0-1",
+    DO_TEST_QEMU("2.6.0", "caps_2.6.0",
                  "/usr/bin/qemu-system-ppc64", NULL,
                  "ppc64le", VIR_DOMAIN_VIRT_KVM);
 
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.replies
rename to tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.xml
rename to tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 9a5a250e91..058ad8ca50 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -160,19 +160,19 @@ mymain(void)
             ret = -1;                                                   \
     } while (0)
 
-    DO_TEST("x86_64", "caps_1.2.2-1");
-    DO_TEST("x86_64", "caps_1.3.1-1");
-    DO_TEST("x86_64", "caps_1.4.2-1");
-    DO_TEST("x86_64", "caps_1.5.3-1");
-    DO_TEST("x86_64", "caps_1.6.0-1");
-    DO_TEST("x86_64", "caps_1.6.50-1");
-    DO_TEST("x86_64", "caps_2.1.1-1");
-    DO_TEST("x86_64", "caps_2.4.0-1");
-    DO_TEST("x86_64", "caps_2.5.0-1");
-    DO_TEST("x86_64", "caps_2.6.0-1");
-    DO_TEST("aarch64", "caps_2.6.0-1");
-    DO_TEST("aarch64", "caps_2.6.0-2");
-    DO_TEST("ppc64le", "caps_2.6.0-1");
+    DO_TEST("x86_64", "caps_1.2.2");
+    DO_TEST("x86_64", "caps_1.3.1");
+    DO_TEST("x86_64", "caps_1.4.2");
+    DO_TEST("x86_64", "caps_1.5.3");
+    DO_TEST("x86_64", "caps_1.6.0");
+    DO_TEST("x86_64", "caps_1.6.50");
+    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("aarch64", "caps_2.6.0-gicv2");
+    DO_TEST("aarch64", "caps_2.6.0-gicv3");
+    DO_TEST("ppc64le", "caps_2.6.0");
 
     /*
      * Run "tests/qemucapsprobe /path/to/qemu/binary >foo.replies"