diff --git a/tests/qemuxml2argvdata/pseries-features-ccf.err b/tests/qemuxml2argvdata/pseries-features-ccf.err
deleted file mode 100644
index 83e88253b8..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-ccf.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: ccf-assist configuration is not supported by this QEMU binary
diff --git a/tests/qemuxml2argvdata/pseries-features-ccf.xml b/tests/qemuxml2argvdata/pseries-features-ccf.xml
deleted file mode 100644
index 037d9feaab..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-ccf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
- guest
- 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
- 524288
-
- hvm
-
-
-
-
-
- /usr/bin/qemu-system-ppc64
-
-
diff --git a/tests/qemuxml2argvdata/pseries-features-cfpc.err b/tests/qemuxml2argvdata/pseries-features-cfpc.err
deleted file mode 100644
index 47938f1a9e..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-cfpc.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: cfpc configuration is not supported by this QEMU binary
diff --git a/tests/qemuxml2argvdata/pseries-features-cfpc.xml b/tests/qemuxml2argvdata/pseries-features-cfpc.xml
deleted file mode 100644
index 9229e87aab..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-cfpc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
- guest
- 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
- 524288
-
- hvm
-
-
-
-
-
- /usr/bin/qemu-system-ppc64
-
-
diff --git a/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.err b/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.err
deleted file mode 100644
index ea3ad282cd..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: Configuring the page size for HPT guests is not supported by this QEMU binary
diff --git a/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.xml b/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.xml
deleted file mode 100644
index ba919f6b0d..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
- guest
- 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
- 524288
-
- hvm
-
-
-
- 1
-
-
-
- /usr/bin/qemu-system-ppc64
-
-
diff --git a/tests/qemuxml2argvdata/pseries-features-htm.err b/tests/qemuxml2argvdata/pseries-features-htm.err
deleted file mode 100644
index d0bbcb0d27..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-htm.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: HTM configuration is not supported by this QEMU binary
diff --git a/tests/qemuxml2argvdata/pseries-features-htm.xml b/tests/qemuxml2argvdata/pseries-features-htm.xml
deleted file mode 100644
index 59ac294161..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-htm.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
- guest
- 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
- 524288
-
- hvm
-
-
-
-
-
- /usr/bin/qemu-system-ppc64
-
-
diff --git a/tests/qemuxml2argvdata/pseries-features-ibs.err b/tests/qemuxml2argvdata/pseries-features-ibs.err
deleted file mode 100644
index 7b4d125a36..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-ibs.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: ibs configuration is not supported by this QEMU binary
diff --git a/tests/qemuxml2argvdata/pseries-features-ibs.xml b/tests/qemuxml2argvdata/pseries-features-ibs.xml
deleted file mode 100644
index c3317b47ba..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-ibs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
- guest
- 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
- 524288
-
- hvm
-
-
-
-
-
- /usr/bin/qemu-system-ppc64
-
-
diff --git a/tests/qemuxml2argvdata/pseries-features-nested-hv.err b/tests/qemuxml2argvdata/pseries-features-nested-hv.err
deleted file mode 100644
index cd6d8a679a..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-nested-hv.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: Nested HV configuration is not supported by this QEMU binary
diff --git a/tests/qemuxml2argvdata/pseries-features-nested-hv.xml b/tests/qemuxml2argvdata/pseries-features-nested-hv.xml
deleted file mode 100644
index 8d74ab41ab..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-nested-hv.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
- guest
- 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
- 524288
-
- hvm
-
-
-
-
-
- /usr/bin/qemu-system-ppc64
-
-
diff --git a/tests/qemuxml2argvdata/pseries-features-sbbc.err b/tests/qemuxml2argvdata/pseries-features-sbbc.err
deleted file mode 100644
index b3c00172aa..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-sbbc.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: sbbc configuration is not supported by this QEMU binary
diff --git a/tests/qemuxml2argvdata/pseries-features-sbbc.xml b/tests/qemuxml2argvdata/pseries-features-sbbc.xml
deleted file mode 100644
index e7f8d46176..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-sbbc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
- guest
- 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
- 524288
-
- hvm
-
-
-
-
-
- /usr/bin/qemu-system-ppc64
-
-
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6560bcfaab..2ed3ae3cb7 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2004,21 +2004,6 @@ mymain(void)
DO_TEST_CAPS_ARCH_VER("pseries-features", "ppc64", "4.2.0");
DO_TEST_CAPS_LATEST_PPC64("pseries-features");
- /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE */
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-hpt-pagesize");
- /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_HTM */
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-htm");
- /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV */
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-nested-hv");
- /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST */
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-ccf");
- /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CFPC */
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-cfpc");
- /* parse error: no QEMU_CAPS_MACHINE_PSERIES_SBBC */
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-sbbc");
- /* parse error: no QEMU_CAPS_MACHINE_PSERIES_IBS */
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-ibs");
-
DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-invalid-machine");
DO_TEST_CAPS_LATEST_PPC64("pseries-serial-native");