diff --git a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
deleted file mode 100644
index ea9737d9ce..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-2.11</machine>
-  <arch>x86_64</arch>
-  <vcpu max='288'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Skylake-Client</model>
-      <vendor>Intel</vendor>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>EPYC</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
deleted file mode 100644
index cccc6830f9..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-2.11</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='no'/>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>EPYC</model>
-      <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='pcommit'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='ospke'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='3dnowext'/>
-      <feature policy='require' name='3dnow'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='fma'/>
-      <feature policy='disable' name='avx'/>
-      <feature policy='disable' name='f16c'/>
-      <feature policy='disable' name='rdrand'/>
-      <feature policy='disable' name='avx2'/>
-      <feature policy='disable' name='rdseed'/>
-      <feature policy='disable' name='sha-ni'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='fxsr_opt'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='3dnowprefetch'/>
-      <feature policy='disable' name='osvw'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>EPYC</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
deleted file mode 100644
index 804bf8020e..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-s390x</path>
-  <domain>kvm</domain>
-  <machine>s390-ccw-virtio-2.11</machine>
-  <arch>s390x</arch>
-  <vcpu max='248'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>z14-base</model>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='cmmnt'/>
-      <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='mepoch'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='iep'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='gs'/>
-      <feature policy='require' name='zpci'/>
-      <feature policy='require' name='sea_esop2'/>
-      <feature policy='require' name='te'/>
-      <feature policy='require' name='cmm'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>z890.2</model>
-      <model usable='yes'>z990.4</model>
-      <model usable='yes'>z10BC.2</model>
-      <model usable='yes'>z196.2</model>
-      <model usable='yes'>z14</model>
-      <model usable='yes'>z9BC-base</model>
-      <model usable='yes'>zEC12-base</model>
-      <model usable='yes'>z196-base</model>
-      <model usable='yes'>z13-base</model>
-      <model usable='yes'>z990.3</model>
-      <model usable='yes'>z9EC</model>
-      <model usable='yes'>zBC12</model>
-      <model usable='yes'>z9EC.3</model>
-      <model usable='yes'>z196.2-base</model>
-      <model usable='yes'>qemu</model>
-      <model usable='yes'>zEC12.2-base</model>
-      <model usable='yes'>z800-base</model>
-      <model usable='yes'>z9EC.2</model>
-      <model usable='yes'>z900.2-base</model>
-      <model usable='yes'>z900.3</model>
-      <model usable='yes'>z890-base</model>
-      <model usable='yes'>z890</model>
-      <model usable='yes'>z990.4-base</model>
-      <model usable='yes'>z10BC.2-base</model>
-      <model usable='yes'>z900.2</model>
-      <model usable='yes'>z9BC.2-base</model>
-      <model usable='yes'>z800</model>
-      <model usable='yes'>z114</model>
-      <model usable='yes'>z13</model>
-      <model usable='yes'>z990</model>
-      <model usable='yes'>z13s-base</model>
-      <model usable='yes'>z990.2</model>
-      <model usable='yes'>z14-base</model>
-      <model usable='yes'>z890.2-base</model>
-      <model usable='yes'>z196</model>
-      <model usable='yes'>z10EC</model>
-      <model usable='yes'>z13s</model>
-      <model usable='yes'>z900</model>
-      <model usable='yes'>z10EC.3</model>
-      <model usable='yes'>z10EC.2-base</model>
-      <model usable='yes'>z114-base</model>
-      <model usable='yes'>z990.2-base</model>
-      <model usable='yes'>z9EC.2-base</model>
-      <model usable='yes'>z890.3</model>
-      <model usable='yes'>z900.3-base</model>
-      <model usable='yes'>z9BC.2</model>
-      <model usable='yes'>z10BC</model>
-      <model usable='yes'>z990.5</model>
-      <model usable='yes'>zEC12.2</model>
-      <model usable='yes'>z10EC-base</model>
-      <model usable='yes'>z9EC-base</model>
-      <model usable='yes'>z9EC.3-base</model>
-      <model usable='yes'>zEC12</model>
-      <model usable='yes'>z990.5-base</model>
-      <model usable='yes'>z10BC-base</model>
-      <model usable='yes'>z900-base</model>
-      <model usable='yes'>z13.2</model>
-      <model usable='yes'>zBC12-base</model>
-      <model usable='yes'>z13.2-base</model>
-      <model usable='yes'>z890.3-base</model>
-      <model usable='yes'>z990-base</model>
-      <model usable='yes'>z10EC.2</model>
-      <model usable='yes'>z9BC</model>
-      <model usable='yes'>z10EC.3-base</model>
-      <model usable='yes'>z990.3-base</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <s390-pv supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
deleted file mode 100644
index 3a8aa2ab71..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-2.11</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Skylake-Client</model>
-      <vendor>Intel</vendor>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>EPYC</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
deleted file mode 100644
index 0dc5995c09..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-2.12</machine>
-  <arch>x86_64</arch>
-  <vcpu max='288'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Haswell-noTSX</model>
-      <vendor>Intel</vendor>
-      <feature policy='require' name='vme'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='f16c'/>
-      <feature policy='require' name='rdrand'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='arat'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='xsaveopt'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='abm'/>
-      <feature policy='require' name='invtsc'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='yes'>
-      <cbitpos>47</cbitpos>
-      <reducedPhysBits>1</reducedPhysBits>
-      <maxGuests>59</maxGuests>
-      <maxESGuests>450</maxESGuests>
-    </sev>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
deleted file mode 100644
index 575506d852..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-2.12</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='no'/>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>EPYC</model>
-      <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='pcommit'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='ospke'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='3dnowext'/>
-      <feature policy='require' name='3dnow'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='fma'/>
-      <feature policy='disable' name='avx'/>
-      <feature policy='disable' name='f16c'/>
-      <feature policy='disable' name='rdrand'/>
-      <feature policy='disable' name='avx2'/>
-      <feature policy='disable' name='rdseed'/>
-      <feature policy='disable' name='sha-ni'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='fxsr_opt'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='3dnowprefetch'/>
-      <feature policy='disable' name='osvw'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='yes'>
-      <cbitpos>47</cbitpos>
-      <reducedPhysBits>1</reducedPhysBits>
-      <maxGuests>59</maxGuests>
-      <maxESGuests>450</maxESGuests>
-    </sev>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
deleted file mode 100644
index 2074c89875..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-aarch64</path>
-  <domain>kvm</domain>
-  <machine>virt-2.12</machine>
-  <arch>aarch64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='no'/>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>pxa262</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>pxa270</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='yes'>
-      <enum name='version'>
-        <value>3</value>
-      </enum>
-    </gic>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
deleted file mode 100644
index a93313f980..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-aarch64</path>
-  <domain>kvm</domain>
-  <machine>integratorcp</machine>
-  <arch>aarch64</arch>
-  <vcpu max='1'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='no'/>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>pxa262</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>pxa270</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
deleted file mode 100644
index cb3edcbd56..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-ppc64</path>
-  <domain>kvm</domain>
-  <machine>pseries-2.12</machine>
-  <arch>ppc64</arch>
-  <vcpu max='1024'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>POWER8</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER9</model>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.s390x.xml b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
deleted file mode 100644
index 5c3d9ce7db..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-s390x</path>
-  <domain>kvm</domain>
-  <machine>s390-ccw-virtio-2.12</machine>
-  <arch>s390x</arch>
-  <vcpu max='248'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>z14-base</model>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='iep'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='gs'/>
-      <feature policy='require' name='ppa15'/>
-      <feature policy='require' name='zpci'/>
-      <feature policy='require' name='sea_esop2'/>
-      <feature policy='require' name='te'/>
-      <feature policy='require' name='cmm'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>z890.2</model>
-      <model usable='yes'>z990.4</model>
-      <model usable='yes'>z10BC.2</model>
-      <model usable='yes'>z196.2</model>
-      <model usable='yes'>z14</model>
-      <model usable='yes'>z9BC-base</model>
-      <model usable='yes'>zEC12-base</model>
-      <model usable='yes'>z196-base</model>
-      <model usable='yes'>z13-base</model>
-      <model usable='yes'>z990.3</model>
-      <model usable='yes'>z9EC</model>
-      <model usable='yes'>zBC12</model>
-      <model usable='yes'>z9EC.3</model>
-      <model usable='yes'>z196.2-base</model>
-      <model usable='no'>qemu</model>
-      <model usable='yes'>zEC12.2-base</model>
-      <model usable='yes'>z800-base</model>
-      <model usable='yes'>z9EC.2</model>
-      <model usable='yes'>z900.2-base</model>
-      <model usable='yes'>z900.3</model>
-      <model usable='yes'>z890-base</model>
-      <model usable='yes'>z890</model>
-      <model usable='yes'>z990.4-base</model>
-      <model usable='yes'>z10BC.2-base</model>
-      <model usable='yes'>z900.2</model>
-      <model usable='yes'>z9BC.2-base</model>
-      <model usable='yes'>z800</model>
-      <model usable='yes'>z114</model>
-      <model usable='yes'>z13</model>
-      <model usable='yes'>z13s-base</model>
-      <model usable='yes'>z990</model>
-      <model usable='yes'>z990.2</model>
-      <model usable='yes'>z14-base</model>
-      <model usable='yes'>z890.2-base</model>
-      <model usable='yes'>z196</model>
-      <model usable='yes'>z10EC</model>
-      <model usable='yes'>z13s</model>
-      <model usable='yes'>z900</model>
-      <model usable='yes'>z10EC.3</model>
-      <model usable='yes'>z10EC.2-base</model>
-      <model usable='yes'>z114-base</model>
-      <model usable='yes'>z990.2-base</model>
-      <model usable='yes'>z9EC.2-base</model>
-      <model usable='yes'>z890.3</model>
-      <model usable='yes'>z900.3-base</model>
-      <model usable='yes'>z9BC.2</model>
-      <model usable='yes'>z10BC</model>
-      <model usable='yes'>z990.5</model>
-      <model usable='yes'>zEC12.2</model>
-      <model usable='yes'>z10EC-base</model>
-      <model usable='yes'>z9EC-base</model>
-      <model usable='yes'>z9EC.3-base</model>
-      <model usable='yes'>zEC12</model>
-      <model usable='yes'>z990.5-base</model>
-      <model usable='yes'>z10BC-base</model>
-      <model usable='yes'>z900-base</model>
-      <model usable='yes'>z13.2</model>
-      <model usable='yes'>z890.3-base</model>
-      <model usable='yes'>zBC12-base</model>
-      <model usable='yes'>z13.2-base</model>
-      <model usable='yes'>z990-base</model>
-      <model usable='yes'>z10EC.2</model>
-      <model usable='yes'>z9BC</model>
-      <model usable='yes'>z10EC.3-base</model>
-      <model usable='yes'>z990.3-base</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <s390-pv supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
deleted file mode 100644
index c8a5558536..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-2.12</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Haswell-noTSX</model>
-      <vendor>Intel</vendor>
-      <feature policy='require' name='vme'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='f16c'/>
-      <feature policy='require' name='rdrand'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='arat'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='xsaveopt'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='abm'/>
-      <feature policy='require' name='invtsc'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='yes'>
-      <cbitpos>47</cbitpos>
-      <reducedPhysBits>1</reducedPhysBits>
-      <maxGuests>59</maxGuests>
-      <maxESGuests>450</maxESGuests>
-    </sev>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
deleted file mode 100644
index 4f80439eb4..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-3.0</machine>
-  <arch>x86_64</arch>
-  <vcpu max='288'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Skylake-Client-IBRS</model>
-      <vendor>Intel</vendor>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='topoext'/>
-      <feature policy='require' name='invtsc'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='yes'>Skylake-Client-IBRS</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge-IBRS</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='yes'>Haswell-noTSX-IBRS</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='yes'>Haswell-IBRS</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>Broadwell-IBRS</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</value>
-        <value>ramfb</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
deleted file mode 100644
index 301101095c..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-3.0</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='no'/>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>EPYC</model>
-      <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='pcommit'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='3dnowext'/>
-      <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='fma'/>
-      <feature policy='disable' name='avx'/>
-      <feature policy='disable' name='f16c'/>
-      <feature policy='disable' name='rdrand'/>
-      <feature policy='disable' name='avx2'/>
-      <feature policy='disable' name='rdseed'/>
-      <feature policy='disable' name='sha-ni'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='fxsr_opt'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='3dnowprefetch'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</value>
-        <value>ramfb</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
deleted file mode 100644
index 8605db5cc8..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-ppc64</path>
-  <domain>kvm</domain>
-  <machine>pseries-3.0</machine>
-  <arch>ppc64</arch>
-  <vcpu max='1024'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>POWER8</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER9</model>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</value>
-        <value>ramfb</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.s390x.xml b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
deleted file mode 100644
index f49b6907ff..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-s390x</path>
-  <domain>kvm</domain>
-  <machine>s390-ccw-virtio-3.0</machine>
-  <arch>s390x</arch>
-  <vcpu max='248'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>z14-base</model>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='cmmnt'/>
-      <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='mepoch'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='mepochptff'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='iep'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='bpb'/>
-      <feature policy='require' name='gs'/>
-      <feature policy='require' name='ppa15'/>
-      <feature policy='require' name='zpci'/>
-      <feature policy='require' name='sea_esop2'/>
-      <feature policy='require' name='te'/>
-      <feature policy='require' name='cmm'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>z890.2</model>
-      <model usable='yes'>z990.4</model>
-      <model usable='yes'>z14ZR1</model>
-      <model usable='yes'>z10BC.2</model>
-      <model usable='yes'>z196.2</model>
-      <model usable='yes'>z14</model>
-      <model usable='yes'>z9BC-base</model>
-      <model usable='yes'>zEC12-base</model>
-      <model usable='yes'>z196-base</model>
-      <model usable='yes'>z13-base</model>
-      <model usable='yes'>z990.3</model>
-      <model usable='yes'>z9EC</model>
-      <model usable='yes'>zBC12</model>
-      <model usable='yes'>z9EC.3</model>
-      <model usable='yes'>z196.2-base</model>
-      <model usable='no'>qemu</model>
-      <model usable='yes'>zEC12.2-base</model>
-      <model usable='yes'>z800-base</model>
-      <model usable='yes'>z9EC.2</model>
-      <model usable='yes'>z900.2-base</model>
-      <model usable='yes'>z14ZR1-base</model>
-      <model usable='yes'>z900.3</model>
-      <model usable='yes'>z890-base</model>
-      <model usable='yes'>z890</model>
-      <model usable='yes'>z990.4-base</model>
-      <model usable='yes'>z10BC.2-base</model>
-      <model usable='yes'>z900.2</model>
-      <model usable='yes'>z9BC.2-base</model>
-      <model usable='yes'>z800</model>
-      <model usable='yes'>z114</model>
-      <model usable='yes'>z13</model>
-      <model usable='yes'>z13s-base</model>
-      <model usable='yes'>z990</model>
-      <model usable='yes'>z990.2</model>
-      <model usable='yes'>z14-base</model>
-      <model usable='yes'>z890.2-base</model>
-      <model usable='yes'>z196</model>
-      <model usable='yes'>z10EC</model>
-      <model usable='yes'>z13s</model>
-      <model usable='yes'>z900</model>
-      <model usable='yes'>z10EC.3</model>
-      <model usable='yes'>z10EC.2-base</model>
-      <model usable='yes'>z114-base</model>
-      <model usable='yes'>z990.2-base</model>
-      <model usable='yes'>z9EC.2-base</model>
-      <model usable='yes'>z890.3</model>
-      <model usable='yes'>z900.3-base</model>
-      <model usable='yes'>z9BC.2</model>
-      <model usable='yes'>z10BC</model>
-      <model usable='yes'>z990.5</model>
-      <model usable='yes'>zEC12.2</model>
-      <model usable='yes'>z10EC-base</model>
-      <model usable='yes'>z9EC-base</model>
-      <model usable='yes'>z9EC.3-base</model>
-      <model usable='yes'>zEC12</model>
-      <model usable='yes'>z990.5-base</model>
-      <model usable='yes'>z10BC-base</model>
-      <model usable='yes'>z900-base</model>
-      <model usable='yes'>z13.2</model>
-      <model usable='yes'>zBC12-base</model>
-      <model usable='yes'>z13.2-base</model>
-      <model usable='yes'>z890.3-base</model>
-      <model usable='yes'>z990-base</model>
-      <model usable='yes'>z10EC.2</model>
-      <model usable='yes'>z9BC</model>
-      <model usable='yes'>z10EC.3-base</model>
-      <model usable='yes'>z990.3-base</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>virtio</value>
-        <value>none</value>
-        <value>ramfb</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <s390-pv supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
deleted file mode 100644
index 650728566e..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-3.0</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Skylake-Client-IBRS</model>
-      <vendor>Intel</vendor>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='topoext'/>
-      <feature policy='require' name='invtsc'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='yes'>Skylake-Client-IBRS</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge-IBRS</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='yes'>Haswell-noTSX-IBRS</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='yes'>Haswell-IBRS</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>Broadwell-IBRS</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</value>
-        <value>ramfb</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>