diff --git a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
deleted file mode 100644
index 4cfa127b7a..0000000000
--- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-
- /usr/bin/qemu-system-x86_64
- kvm
- pc-q35-4.0
- 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_4.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
deleted file mode 100644
index 06baee7f68..0000000000
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-
- /usr/bin/qemu-system-x86_64
- qemu
- pc-i440fx-4.0
- 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_4.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
deleted file mode 100644
index 7108efe3b4..0000000000
--- a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-
- /usr/bin/qemu-system-aarch64
- kvm
- virt-4.0
- aarch64
-
-
-
-
- efi
-
-
- /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
-
-
-
-
- pxa262
- pxa270-a0
- arm1136
- cortex-a15
- pxa260
- arm1136-r2
- pxa261
- pxa255
- cortex-a72
- cortex-m33
- arm926
- cortex-r5f
- arm11mpcore
- pxa250
- ti925t
- cortex-a57
- sa1110
- arm1176
- cortex-a53
- sa1100
- pxa270-c5
- cortex-a9
- cortex-a8
- cortex-a7
- pxa270-c0
- arm1026
- pxa270-b1
- cortex-m3
- max
- cortex-m4
- pxa270-b0
- arm946
- cortex-m0
- cortex-r5
- pxa270-a1
- pxa270
-
-
-
-
- file
- anonymous
- memfd
-
-
-
-
-
- disk
- cdrom
- floppy
- lun
-
-
- fdc
- 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
-
-
-
-
-
-
-
- 3
-
-
-
-
-
-
-
-
-
diff --git a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
deleted file mode 100644
index 1e7db635d0..0000000000
--- a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-
- /usr/bin/qemu-system-aarch64
- kvm
- integratorcp
- aarch64
-
-
-
-
-
- /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
-
-
-
-
- pxa262
- pxa270-a0
- arm1136
- cortex-a15
- pxa260
- arm1136-r2
- pxa261
- pxa255
- cortex-a72
- cortex-m33
- arm926
- cortex-r5f
- arm11mpcore
- pxa250
- ti925t
- cortex-a57
- sa1110
- arm1176
- cortex-a53
- sa1100
- pxa270-c5
- cortex-a9
- cortex-a8
- cortex-a7
- pxa270-c0
- arm1026
- pxa270-b1
- cortex-m3
- max
- cortex-m4
- pxa270-b0
- arm946
- cortex-m0
- cortex-r5
- pxa270-a1
- pxa270
-
-
-
-
- file
- anonymous
- memfd
-
-
-
-
-
- disk
- cdrom
- floppy
- lun
-
-
- fdc
- 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_4.0.0.ppc64.xml b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
deleted file mode 100644
index f109d36266..0000000000
--- a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-
- /usr/bin/qemu-system-ppc64
- kvm
- pseries-4.0
- 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_4.0.0.s390x.xml b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
deleted file mode 100644
index b810ad737a..0000000000
--- a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-
- /usr/bin/qemu-system-s390x
- kvm
- s390-ccw-virtio-4.0
- s390x
-
-
-
-
-
- /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
-
-
-
- z14.2-base
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- z14.2
- z890.2
- z990.4
- z14ZR1
- z10BC.2
- z196.2
- z14
- z9BC-base
- zEC12-base
- z196-base
- z13-base
- z990.3
- z9EC
- zBC12
- z9EC.3
- z196.2-base
- qemu
- zEC12.2-base
- z800-base
- z9EC.2
- z900.2-base
- z14ZR1-base
- z900.3
- z890
- z890-base
- z990.4-base
- z10BC.2-base
- z900.2
- z9BC.2-base
- z800
- z114
- z13
- z990
- z13s-base
- z990.2
- z14.2-base
- z14-base
- z890.2-base
- z196
- z10EC
- z13s
- z900
- z10EC.3
- z10EC.2-base
- z114-base
- z990.2-base
- z9EC.2-base
- z890.3
- z900.3-base
- z9BC.2
- z10BC
- z990.5
- zEC12.2
- z10EC-base
- z9EC-base
- z9EC.3-base
- zEC12
- z990.5-base
- z10BC-base
- max
- z900-base
- z13.2
- zBC12-base
- z13.2-base
- z890.3-base
- z990-base
- z10EC.2
- z9BC
- z10EC.3-base
- z990.3-base
-
-
-
-
- file
- anonymous
- memfd
-
-
-
-
-
- disk
- cdrom
- floppy
- lun
-
-
- fdc
- scsi
- virtio
-
-
- virtio
- virtio-transitional
- virtio-non-transitional
-
-
-
-
- sdl
- vnc
- egl-headless
-
-
-
-
-
- subsystem
-
-
- default
- mandatory
- requisite
- optional
-
-
- pci
- scsi
-
-
-
- default
- vfio
-
-
-
-
- virtio
- virtio-transitional
- virtio-non-transitional
-
-
- random
- egd
-
-
-
-
- path
- handle
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
deleted file mode 100644
index 6d6e9bbc3f..0000000000
--- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-
- /usr/bin/qemu-system-x86_64
- kvm
- pc-i440fx-4.0
- 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
-
-
-
-
-
-
-
-
-
-
-
-