diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 748d43f488..ff66a833c9 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -730,14 +730,34 @@ mymain(void)
 # define DO_TEST_CAPS_VER(name, ver) \
     DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
 
-# define DO_TEST_CAPS_LATEST_FAILURE(name) \
-    DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", \
+# define DO_TEST_CAPS_ARCH_LATEST_FAILURE(name, arch) \
+    DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \
                                   ARG_FLAGS, FLAG_EXPECT_FAILURE)
 
-# define DO_TEST_CAPS_LATEST_PARSE_ERROR(name) \
-    DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", \
+# define DO_TEST_CAPS_ARCH_VER_FAILURE(name, arch, ver) \
+    DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, \
+                               ARG_FLAGS, FLAG_EXPECT_FAILURE)
+
+# define DO_TEST_CAPS_LATEST_FAILURE(name) \
+    DO_TEST_CAPS_ARCH_LATEST_FAILURE(name, "x86_64")
+
+# define DO_TEST_CAPS_VER_FAILURE(name, ver) \
+    DO_TEST_CAPS_ARCH_VER_FAILURE(name, "x86_64", ver)
+
+# define DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR(name, arch) \
+    DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \
                                   ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR)
 
+# define DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, arch, ver) \
+    DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, \
+                               ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR)
+
+# define DO_TEST_CAPS_LATEST_PARSE_ERROR(name) \
+    DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR(name, "x86_64")
+
+# define DO_TEST_CAPS_VER_PARSE_ERROR(name, ver) \
+    DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, "x86_64", ver)
+
 # define DO_TEST_FULL(name, ...) \
     DO_TEST_INTERNAL(name, "", \
                      __VA_ARGS__, QEMU_CAPS_LAST)