diff --git a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
deleted file mode 100644
index 0cbfd675fa..0000000000
--- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-
- /usr/bin/qemu-system-x86_64
- kvm
- pc-q35-3.1
- x86_64
-
-
-
-
- bios
- efi
-
-
- /usr/share/AAVMF/AAVMF_CODE.fd
- /usr/share/AAVMF/AAVMF32_CODE.fd
- /usr/share/OVMF/OVMF_CODE.fd
-
- rom
- pflash
-
-
- yes
- no
-
-
- yes
- no
-
-
-
-
-
-
- on
- off
-
-
-
-
- on
- off
-
-
-
- Skylake-Client-IBRS
- Intel
-
-
-
-
-
-
-
-
-
-
-
-
- qemu64
- qemu32
- phenom
- pentium3
- pentium2
- pentium
- n270
- kvm64
- kvm32
- coreduo
- core2duo
- athlon
- Westmere-IBRS
- Westmere
- Skylake-Server-IBRS
- Skylake-Server
- Skylake-Client-IBRS
- Skylake-Client
- SandyBridge-IBRS
- SandyBridge
- Penryn
- Opteron_G5
- Opteron_G4
- Opteron_G3
- Opteron_G2
- Opteron_G1
- Nehalem-IBRS
- Nehalem
- IvyBridge-IBRS
- IvyBridge
- Icelake-Server
- Icelake-Client
- Haswell-noTSX-IBRS
- Haswell-noTSX
- Haswell-IBRS
- Haswell
- EPYC-IBPB
- EPYC
- Conroe
- Cascadelake-Server
- Broadwell-noTSX-IBRS
- Broadwell-noTSX
- Broadwell-IBRS
- Broadwell
- 486
-
-
-
-
- file
- anonymous
- memfd
-
-
-
-
-
- disk
- cdrom
- floppy
- lun
-
-
- fdc
- scsi
- virtio
- usb
- sata
-
-
- virtio
- virtio-transitional
- virtio-non-transitional
-
-
-
-
- sdl
- vnc
- spice
- egl-headless
-
-
-
-
-
- subsystem
-
-
- default
- mandatory
- requisite
- optional
-
-
- usb
- pci
- scsi
-
-
-
- default
- vfio
-
-
-
-
- virtio
- virtio-transitional
- virtio-non-transitional
-
-
- random
- egd
-
-
-
-
- path
- handle
-
-
-
-
- tpm-tis
- tpm-crb
-
-
- passthrough
- emulator
-
-
- 1.2
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
deleted file mode 100644
index 823af73010..0000000000
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-
- /usr/bin/qemu-system-x86_64
- qemu
- pc-i440fx-3.1
- x86_64
-
-
-
-
- bios
- efi
-
-
- /usr/share/AAVMF/AAVMF_CODE.fd
- /usr/share/AAVMF/AAVMF32_CODE.fd
- /usr/share/OVMF/OVMF_CODE.fd
-
- rom
- pflash
-
-
- yes
- no
-
-
- no
-
-
-
-
-
-
-
- on
- off
-
-
-
- Opteron_G3
- AMD
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- qemu64
- qemu32
- phenom
- pentium3
- pentium2
- pentium
- n270
- kvm64
- kvm32
- coreduo
- core2duo
- athlon
- Westmere-IBRS
- Westmere
- Skylake-Server-IBRS
- Skylake-Server
- Skylake-Client-IBRS
- Skylake-Client
- SandyBridge-IBRS
- SandyBridge
- Penryn
- Opteron_G5
- Opteron_G4
- Opteron_G3
- Opteron_G2
- Opteron_G1
- Nehalem-IBRS
- Nehalem
- IvyBridge-IBRS
- IvyBridge
- Icelake-Server
- Icelake-Client
- Haswell-noTSX-IBRS
- Haswell-noTSX
- Haswell-IBRS
- Haswell
- EPYC-IBPB
- EPYC
- Conroe
- Cascadelake-Server
- Broadwell-noTSX-IBRS
- Broadwell-noTSX
- Broadwell-IBRS
- Broadwell
- 486
-
-
-
-
- file
- anonymous
- memfd
-
-
-
-
-
- disk
- cdrom
- floppy
- lun
-
-
- ide
- fdc
- scsi
- virtio
- usb
- sata
-
-
- virtio
- virtio-transitional
- virtio-non-transitional
-
-
-
-
- sdl
- vnc
- spice
- egl-headless
-
-
-
-
-
- subsystem
-
-
- default
- mandatory
- requisite
- optional
-
-
- usb
- pci
- scsi
-
-
-
- default
- vfio
-
-
-
-
- virtio
- virtio-transitional
- virtio-non-transitional
-
-
- random
- egd
-
-
-
-
- path
- handle
-
-
-
-
- tpm-tis
- tpm-crb
-
-
- passthrough
- emulator
-
-
- 1.2
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
deleted file mode 100644
index 8035f7230a..0000000000
--- a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-
- /usr/bin/qemu-system-ppc64
- kvm
- pseries-3.1
- ppc64
-
-
-
-
-
- /usr/share/AAVMF/AAVMF_CODE.fd
- /usr/share/AAVMF/AAVMF32_CODE.fd
- /usr/share/OVMF/OVMF_CODE.fd
-
- rom
- pflash
-
-
- yes
- no
-
-
- no
-
-
-
-
-
-
- off
-
-
-
-
- on
- off
-
-
-
- POWER8
-
-
- POWER9
- POWER8
- POWER7
-
-
-
-
- file
- anonymous
- memfd
-
-
-
-
-
- disk
- cdrom
- lun
-
-
- scsi
- virtio
- usb
- sata
-
-
- virtio
- virtio-transitional
- virtio-non-transitional
-
-
-
-
- sdl
- vnc
- egl-headless
-
-
-
-
-
- subsystem
-
-
- default
- mandatory
- requisite
- optional
-
-
- usb
- pci
- scsi
-
-
-
- default
- vfio
-
-
-
-
- virtio
- virtio-transitional
- virtio-non-transitional
-
-
- random
- egd
-
-
-
-
- path
- handle
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
deleted file mode 100644
index 0b1f60e89d..0000000000
--- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-
- /usr/bin/qemu-system-x86_64
- kvm
- pc-i440fx-3.1
- x86_64
-
-
-
-
- bios
- efi
-
-
- /usr/share/AAVMF/AAVMF_CODE.fd
- /usr/share/AAVMF/AAVMF32_CODE.fd
- /usr/share/OVMF/OVMF_CODE.fd
-
- rom
- pflash
-
-
- yes
- no
-
-
- no
-
-
-
-
-
-
- on
- off
-
-
-
-
- on
- off
-
-
-
- Skylake-Client-IBRS
- Intel
-
-
-
-
-
-
-
-
-
-
-
-
- qemu64
- qemu32
- phenom
- pentium3
- pentium2
- pentium
- n270
- kvm64
- kvm32
- coreduo
- core2duo
- athlon
- Westmere-IBRS
- Westmere
- Skylake-Server-IBRS
- Skylake-Server
- Skylake-Client-IBRS
- Skylake-Client
- SandyBridge-IBRS
- SandyBridge
- Penryn
- Opteron_G5
- Opteron_G4
- Opteron_G3
- Opteron_G2
- Opteron_G1
- Nehalem-IBRS
- Nehalem
- IvyBridge-IBRS
- IvyBridge
- Icelake-Server
- Icelake-Client
- Haswell-noTSX-IBRS
- Haswell-noTSX
- Haswell-IBRS
- Haswell
- EPYC-IBPB
- EPYC
- Conroe
- Cascadelake-Server
- Broadwell-noTSX-IBRS
- Broadwell-noTSX
- Broadwell-IBRS
- Broadwell
- 486
-
-
-
-
- file
- anonymous
- memfd
-
-
-
-
-
- disk
- cdrom
- floppy
- lun
-
-
- ide
- fdc
- scsi
- virtio
- usb
- sata
-
-
- virtio
- virtio-transitional
- virtio-non-transitional
-
-
-
-
- sdl
- vnc
- spice
- egl-headless
-
-
-
-
-
- subsystem
-
-
- default
- mandatory
- requisite
- optional
-
-
- usb
- pci
- scsi
-
-
-
- default
- vfio
-
-
-
-
- virtio
- virtio-transitional
- virtio-non-transitional
-
-
- random
- egd
-
-
-
-
- path
- handle
-
-
-
-
- tpm-tis
- tpm-crb
-
-
- passthrough
- emulator
-
-
- 1.2
-
-
-
-
-
-
-
-
-
-
-
-