diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml b/tests/qemuxml2xmloutdata/balloon-device-auto.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/balloon-device-auto.xml
rename to tests/qemuxml2xmloutdata/balloon-device-auto.x86_64-latest.xml
index 3480561192..3cb86d645c 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-auto.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-period.xml b/tests/qemuxml2xmloutdata/balloon-device-period.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/balloon-device-period.xml
rename to tests/qemuxml2xmloutdata/balloon-device-period.x86_64-latest.xml
index 2c4409c3e5..a8ccf734d8 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-period.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-period.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml b/tests/qemuxml2xmloutdata/blkiotune-device.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/blkiotune-device.xml
rename to tests/qemuxml2xmloutdata/blkiotune-device.x86_64-latest.xml
index 917fcb18ae..6bd7f287be 100644
--- a/tests/qemuxml2xmloutdata/blkiotune-device.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune-device.x86_64-latest.xml
@@ -27,6 +27,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -39,7 +42,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/blkiotune.xml b/tests/qemuxml2xmloutdata/blkiotune.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/blkiotune.xml
rename to tests/qemuxml2xmloutdata/blkiotune.x86_64-latest.xml
index 087b18fa8d..5ca540d9d3 100644
--- a/tests/qemuxml2xmloutdata/blkiotune.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune.x86_64-latest.xml
@@ -11,6 +11,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.xml b/tests/qemuxml2xmloutdata/channel-guestfwd.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/channel-guestfwd.xml
rename to tests/qemuxml2xmloutdata/channel-guestfwd.x86_64-latest.xml
index ef2932b0ca..f5e98b3b78 100644
--- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
+++ b/tests/qemuxml2xmloutdata/channel-guestfwd.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/channel-virtio-auto.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml
index 4011ab5034..0056916d3a 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-active.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-state-active.x86_64-latest.xml
index 285ac5947a..a4ffae81e8 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-state-inactive.x86_64-latest.xml
index 205a88b64a..40bd003c59 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio.xml b/tests/qemuxml2xmloutdata/channel-virtio.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/channel-virtio.xml
rename to tests/qemuxml2xmloutdata/channel-virtio.x86_64-latest.xml
index 515746b44c..abc334734a 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/clock-localtime.xml b/tests/qemuxml2xmloutdata/clock-localtime.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/clock-localtime.xml
rename to tests/qemuxml2xmloutdata/clock-localtime.x86_64-latest.xml
index 164c1c9192..9914ab69a8 100644
--- a/tests/qemuxml2xmloutdata/clock-localtime.xml
+++ b/tests/qemuxml2xmloutdata/clock-localtime.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='localtime'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
rename to tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.x86_64-latest.xml
index 1eabd0a87f..b62bd81a37 100644
--- a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.x86_64-latest.xml
@@ -11,6 +11,9 @@
   <features>
     <pae/>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'>
     <timer name='hypervclock' present='yes'/>
   </clock>
@@ -19,7 +22,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/clock-utc.xml b/tests/qemuxml2xmloutdata/clock-utc.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/clock-utc.xml
rename to tests/qemuxml2xmloutdata/clock-utc.x86_64-latest.xml
index b41600b100..8634c475f3 100644
--- a/tests/qemuxml2xmloutdata/clock-utc.xml
+++ b/tests/qemuxml2xmloutdata/clock-utc.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/console-compat2.xml b/tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/console-compat2.xml
rename to tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml
index 88b8f73f8f..81bbb554d0 100644
--- a/tests/qemuxml2xmloutdata/console-compat2.xml
+++ b/tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.xml b/tests/qemuxml2xmloutdata/console-virtio-many.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/console-virtio-many.xml
rename to tests/qemuxml2xmloutdata/console-virtio-many.x86_64-latest.xml
index be11dc68b9..067fda5574 100644
--- a/tests/qemuxml2xmloutdata/console-virtio-many.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio-many.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/console-virtio.xml b/tests/qemuxml2xmloutdata/console-virtio.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/console-virtio.xml
rename to tests/qemuxml2xmloutdata/console-virtio.x86_64-latest.xml
index a14ba28c8d..36392004f5 100644
--- a/tests/qemuxml2xmloutdata/console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml b/tests/qemuxml2xmloutdata/cpu-host-model-features.x86_64-latest.xml
similarity index 96%
rename from tests/qemuxml2xmloutdata/cpu-host-model-features.xml
rename to tests/qemuxml2xmloutdata/cpu-host-model-features.x86_64-latest.xml
index 3dffde20b2..0d4b236371 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-features.x86_64-latest.xml
@@ -24,7 +24,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
rename to tests/qemuxml2xmloutdata/cpu-host-passthrough-features.x86_64-latest.xml
index 03a8f45019..35c99b533a 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.x86_64-latest.xml
@@ -13,7 +13,7 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu mode='host-passthrough' check='none' migratable='off'>
+  <cpu mode='host-passthrough' check='none' migratable='on'>
     <feature policy='require' name='abm'/>
     <feature policy='force' name='ds'/>
     <feature policy='disable' name='invtsc'/>
@@ -30,7 +30,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml b/tests/qemuxml2xmloutdata/cpu-kvmclock.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-kvmclock.xml
rename to tests/qemuxml2xmloutdata/cpu-kvmclock.x86_64-latest.xml
index 40cf0db24b..cd3a2ef539 100644
--- a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-kvmclock.x86_64-latest.xml
@@ -19,7 +19,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml b/tests/qemuxml2xmloutdata/disk-active-commit-active.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-active-commit-active.xml
rename to tests/qemuxml2xmloutdata/disk-active-commit-active.x86_64-latest.xml
index 03294b7a6c..cbe47150a9 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-active-commit-inactive.x86_64-latest.xml
index 1803b844f8..10a9dace61 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-active.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/disk-mirror-active.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-active.x86_64-latest.xml
index 732054c65c..0cd61afa5c 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -77,7 +80,7 @@
       <target dev='vdc' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-inactive.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-inactive.x86_64-latest.xml
index ae96a63a3b..f94cd6519f 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -50,7 +53,7 @@
       <target dev='vdc' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-active.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-old-active.x86_64-latest.xml
index ecff3883c2..0732cf9e9c 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -51,7 +54,7 @@
       <target dev='vdb' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-old-inactive.x86_64-latest.xml
index e0deb1deda..ec598bfdbd 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -43,7 +46,7 @@
       <target dev='vdb' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/input-usbmouse.xml b/tests/qemuxml2xmloutdata/input-usbmouse.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/input-usbmouse.xml
rename to tests/qemuxml2xmloutdata/input-usbmouse.x86_64-latest.xml
index 554e1616d1..dc1c45005f 100644
--- a/tests/qemuxml2xmloutdata/input-usbmouse.xml
+++ b/tests/qemuxml2xmloutdata/input-usbmouse.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/input-usbtablet.xml b/tests/qemuxml2xmloutdata/input-usbtablet.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/input-usbtablet.xml
rename to tests/qemuxml2xmloutdata/input-usbtablet.x86_64-latest.xml
index f5ad2cdcd8..b1c17ba209 100644
--- a/tests/qemuxml2xmloutdata/input-usbtablet.xml
+++ b/tests/qemuxml2xmloutdata/input-usbtablet.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/kvmclock.xml b/tests/qemuxml2xmloutdata/kvmclock.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/kvmclock.xml
rename to tests/qemuxml2xmloutdata/kvmclock.x86_64-latest.xml
index 809e7b3295..7d385b3270 100644
--- a/tests/qemuxml2xmloutdata/kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/kvmclock.x86_64-latest.xml
@@ -11,6 +11,9 @@
   <features>
     <pae/>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'>
     <timer name='kvmclock' present='no'/>
   </clock>
@@ -19,7 +22,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/lease.xml b/tests/qemuxml2xmloutdata/lease.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/lease.xml
rename to tests/qemuxml2xmloutdata/lease.x86_64-latest.xml
index 38d4c5c232..d400fb1fef 100644
--- a/tests/qemuxml2xmloutdata/lease.xml
+++ b/tests/qemuxml2xmloutdata/lease.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/machine-core-off.xml b/tests/qemuxml2xmloutdata/machine-core-off.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/machine-core-off.xml
rename to tests/qemuxml2xmloutdata/machine-core-off.x86_64-latest.xml
index 77527bfe64..a7636a953d 100644
--- a/tests/qemuxml2xmloutdata/machine-core-off.xml
+++ b/tests/qemuxml2xmloutdata/machine-core-off.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/machine-core-on.xml b/tests/qemuxml2xmloutdata/machine-core-on.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/machine-core-on.xml
rename to tests/qemuxml2xmloutdata/machine-core-on.x86_64-latest.xml
index 025b88f2de..6e70f8c88b 100644
--- a/tests/qemuxml2xmloutdata/machine-core-on.xml
+++ b/tests/qemuxml2xmloutdata/machine-core-on.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/memory-hotplug.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml
index 593542072a..083102e8d6 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml
@@ -9,7 +9,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
@@ -30,7 +31,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-set.xml b/tests/qemuxml2xmloutdata/memorybacking-set.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/memorybacking-set.xml
rename to tests/qemuxml2xmloutdata/memorybacking-set.x86_64-latest.xml
index c5c64e3f1a..9825bae2a0 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-set.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-set.x86_64-latest.xml
@@ -13,13 +13,16 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-unset.xml b/tests/qemuxml2xmloutdata/memorybacking-unset.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/memorybacking-unset.xml
rename to tests/qemuxml2xmloutdata/memorybacking-unset.x86_64-latest.xml
index 2753412d32..d1f6214b5a 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-unset.x86_64-latest.xml
@@ -13,13 +13,16 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.xml b/tests/qemuxml2xmloutdata/memtune-unlimited.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/memtune-unlimited.xml
rename to tests/qemuxml2xmloutdata/memtune-unlimited.x86_64-latest.xml
index 032ddfc48d..576657ee94 100644
--- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
+++ b/tests/qemuxml2xmloutdata/memtune-unlimited.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/memtune.xml b/tests/qemuxml2xmloutdata/memtune.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/memtune.xml
rename to tests/qemuxml2xmloutdata/memtune.x86_64-latest.xml
index ed6992ffde..e1bdad430e 100644
--- a/tests/qemuxml2xmloutdata/memtune.xml
+++ b/tests/qemuxml2xmloutdata/memtune.x86_64-latest.xml
@@ -13,6 +13,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.xml b/tests/qemuxml2xmloutdata/metadata-duplicate.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/metadata-duplicate.xml
rename to tests/qemuxml2xmloutdata/metadata-duplicate.x86_64-latest.xml
index d77f4af6e1..f96228c234 100644
--- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
+++ b/tests/qemuxml2xmloutdata/metadata-duplicate.x86_64-latest.xml
@@ -12,6 +12,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/metadata.xml b/tests/qemuxml2xmloutdata/metadata.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/metadata.xml
rename to tests/qemuxml2xmloutdata/metadata.x86_64-latest.xml
index d77f4af6e1..f96228c234 100644
--- a/tests/qemuxml2xmloutdata/metadata.xml
+++ b/tests/qemuxml2xmloutdata/metadata.x86_64-latest.xml
@@ -12,6 +12,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/migrate.xml b/tests/qemuxml2xmloutdata/migrate.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/migrate.xml
rename to tests/qemuxml2xmloutdata/migrate.x86_64-latest.xml
index 82f5c9f9e8..f6963d383b 100644
--- a/tests/qemuxml2xmloutdata/migrate.xml
+++ b/tests/qemuxml2xmloutdata/migrate.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/minimal.xml b/tests/qemuxml2xmloutdata/minimal.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/minimal.xml
rename to tests/qemuxml2xmloutdata/minimal.x86_64-latest.xml
index baed180b00..5f26f47508 100644
--- a/tests/qemuxml2xmloutdata/minimal.xml
+++ b/tests/qemuxml2xmloutdata/minimal.x86_64-latest.xml
@@ -13,6 +13,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/misc-uuid.xml b/tests/qemuxml2xmloutdata/misc-acpi.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-uuid.xml
rename to tests/qemuxml2xmloutdata/misc-acpi.x86_64-latest.xml
index e92fa21b65..176926bb60 100644
--- a/tests/qemuxml2xmloutdata/misc-uuid.xml
+++ b/tests/qemuxml2xmloutdata/misc-acpi.x86_64-latest.xml
@@ -11,6 +11,9 @@
   <features>
     <acpi/>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/misc-acpi.xml b/tests/qemuxml2xmloutdata/misc-uuid.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-acpi.xml
rename to tests/qemuxml2xmloutdata/misc-uuid.x86_64-latest.xml
index e92fa21b65..176926bb60 100644
--- a/tests/qemuxml2xmloutdata/misc-acpi.xml
+++ b/tests/qemuxml2xmloutdata/misc-uuid.x86_64-latest.xml
@@ -11,6 +11,9 @@
   <features>
     <acpi/>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-eth-hostip.xml b/tests/qemuxml2xmloutdata/net-eth-hostip.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-eth-hostip.xml
rename to tests/qemuxml2xmloutdata/net-eth-hostip.x86_64-latest.xml
index 08f4e2d13f..a306be0c5b 100644
--- a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-hostip.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-eth-ifname.xml b/tests/qemuxml2xmloutdata/net-eth-ifname.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-eth-ifname.xml
rename to tests/qemuxml2xmloutdata/net-eth-ifname.x86_64-latest.xml
index d60e4c345e..53f3c34863 100644
--- a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-ifname.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
rename to tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.x86_64-latest.xml
index 216b745428..cc782e6424 100644
--- a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-eth.xml b/tests/qemuxml2xmloutdata/net-eth.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-eth.xml
rename to tests/qemuxml2xmloutdata/net-eth.x86_64-latest.xml
index 15e49c152b..2f10115c9d 100644
--- a/tests/qemuxml2xmloutdata/net-eth.xml
+++ b/tests/qemuxml2xmloutdata/net-eth.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
rename to tests/qemuxml2xmloutdata/net-hostdev-bootorder.x86_64-latest.xml
index 8a5842c55a..a3de352ad1 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.x86_64-latest.xml
@@ -7,6 +7,9 @@
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <boot order='2'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev.xml b/tests/qemuxml2xmloutdata/net-hostdev.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/net-hostdev.xml
rename to tests/qemuxml2xmloutdata/net-hostdev.x86_64-latest.xml
index 3e751155bd..49464c0efa 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml b/tests/qemuxml2xmloutdata/net-midonet.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-midonet.xml
rename to tests/qemuxml2xmloutdata/net-midonet.x86_64-latest.xml
index 2ddb6b8ad8..f4ed915764 100644
--- a/tests/qemuxml2xmloutdata/net-midonet.xml
+++ b/tests/qemuxml2xmloutdata/net-midonet.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.xml b/tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-openvswitch.xml
rename to tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml
index ebc11a4542..1512b118a5 100644
--- a/tests/qemuxml2xmloutdata/net-openvswitch.xml
+++ b/tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-server.xml b/tests/qemuxml2xmloutdata/net-server.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-server.xml
rename to tests/qemuxml2xmloutdata/net-server.x86_64-latest.xml
index 9be587229c..ad1e13cf1e 100644
--- a/tests/qemuxml2xmloutdata/net-server.xml
+++ b/tests/qemuxml2xmloutdata/net-server.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-udp.xml
rename to tests/qemuxml2xmloutdata/net-udp.x86_64-latest.xml
index 65eaabdaf5..f9298997ff 100644
--- a/tests/qemuxml2xmloutdata/net-udp.xml
+++ b/tests/qemuxml2xmloutdata/net-udp.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml b/tests/qemuxml2xmloutdata/net-virtio-device.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-virtio-device.xml
rename to tests/qemuxml2xmloutdata/net-virtio-device.x86_64-latest.xml
index bff89186a9..905f55fa15 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-device.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-device.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
rename to tests/qemuxml2xmloutdata/net-virtio-disable-offloads.x86_64-latest.xml
index 7932c50269..c680b52b35 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
rename to tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml
index 11341c7d85..43c10ffc60 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
rename to tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.x86_64-latest.xml
index 7474141a6e..6129648c53 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio.xml b/tests/qemuxml2xmloutdata/net-virtio.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/net-virtio.xml
rename to tests/qemuxml2xmloutdata/net-virtio.x86_64-latest.xml
index a39b9bb1df..5b0199ec40 100644
--- a/tests/qemuxml2xmloutdata/net-virtio.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/nosharepages.xml b/tests/qemuxml2xmloutdata/nosharepages.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/nosharepages.xml
rename to tests/qemuxml2xmloutdata/nosharepages.x86_64-latest.xml
index 47157a59bd..1b3c099e2c 100644
--- a/tests/qemuxml2xmloutdata/nosharepages.xml
+++ b/tests/qemuxml2xmloutdata/nosharepages.x86_64-latest.xml
@@ -11,6 +11,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
rename to tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
index 8d0cdb7cc4..2d04bc23c2 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
@@ -11,7 +11,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
@@ -29,7 +30,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
rename to tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
index 7d25196914..80f7284126 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
@@ -11,7 +11,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
@@ -29,7 +30,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
rename to tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
index d905ec2978..724209f6e3 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
@@ -11,7 +11,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
@@ -29,7 +30,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
rename to tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
index 83be2dd639..2a4ee0d496 100644
--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
@@ -8,7 +8,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
@@ -26,7 +27,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/pci-rom.xml
rename to tests/qemuxml2xmloutdata/pci-rom.x86_64-latest.xml
index f5f19669fa..c7d493bd33 100644
--- a/tests/qemuxml2xmloutdata/pci-rom.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/pmu-feature-off.xml b/tests/qemuxml2xmloutdata/pmu-feature-off.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/pmu-feature-off.xml
rename to tests/qemuxml2xmloutdata/pmu-feature-off.x86_64-latest.xml
index 77bf61d1e2..f56a062d48 100644
--- a/tests/qemuxml2xmloutdata/pmu-feature-off.xml
+++ b/tests/qemuxml2xmloutdata/pmu-feature-off.x86_64-latest.xml
@@ -12,13 +12,16 @@
     <acpi/>
     <pmu state='off'/>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/pmu-feature.xml b/tests/qemuxml2xmloutdata/pmu-feature.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/pmu-feature.xml
rename to tests/qemuxml2xmloutdata/pmu-feature.x86_64-latest.xml
index 32a1813f6c..84b7fd3bc7 100644
--- a/tests/qemuxml2xmloutdata/pmu-feature.xml
+++ b/tests/qemuxml2xmloutdata/pmu-feature.x86_64-latest.xml
@@ -12,13 +12,16 @@
     <acpi/>
     <pmu state='on'/>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml b/tests/qemuxml2xmloutdata/qemu-ns-no-env.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
rename to tests/qemuxml2xmloutdata/qemu-ns-no-env.x86_64-latest.xml
index 1a8efd598d..c6c548429c 100644
--- a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
+++ b/tests/qemuxml2xmloutdata/qemu-ns-no-env.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
rename to tests/qemuxml2xmloutdata/reboot-timeout-disabled.x86_64-latest.xml
index 74b8c753e5..2d98504634 100644
--- a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
+++ b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.x86_64-latest.xml
@@ -9,13 +9,16 @@
     <boot dev='network'/>
     <bios rebootTimeout='-1'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
rename to tests/qemuxml2xmloutdata/reboot-timeout-enabled.x86_64-latest.xml
index 3b34928f2b..1d9ef67fb0 100644
--- a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
+++ b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.x86_64-latest.xml
@@ -9,13 +9,16 @@
     <boot dev='network'/>
     <bios rebootTimeout='128'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml
new file mode 100644
index 0000000000..f6963d383b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml
@@ -0,0 +1,38 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type='block' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/restore-v2.xml b/tests/qemuxml2xmloutdata/restore-v2.xml
deleted file mode 100644
index 82f5c9f9e8..0000000000
--- a/tests/qemuxml2xmloutdata/restore-v2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<domain type='qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <controller type='usb' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='ide' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml b/tests/qemuxml2xmloutdata/seclabel-dac-none.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/seclabel-dac-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-dac-none.x86_64-latest.xml
index b5cc10d530..2e86805b10 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml b/tests/qemuxml2xmloutdata/seclabel-device-multiple.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
rename to tests/qemuxml2xmloutdata/seclabel-device-multiple.x86_64-latest.xml
index b571707422..e92a363374 100644
--- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-none.x86_64-latest.xml
index a2b4a3e19e..d94c33d47b 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-none.xml b/tests/qemuxml2xmloutdata/seclabel-none.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/seclabel-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-none.x86_64-latest.xml
index a2b4a3e19e..d94c33d47b 100644
--- a/tests/qemuxml2xmloutdata/seclabel-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-none.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
rename to tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.x86_64-latest.xml
index 3cc87b0b1f..986bf3db4e 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
rename to tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.x86_64-latest.xml
index ae03203ad3..d778416b04 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static.xml b/tests/qemuxml2xmloutdata/seclabel-static.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/seclabel-static.xml
rename to tests/qemuxml2xmloutdata/seclabel-static.x86_64-latest.xml
index 391b8b57f8..aff629d759 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml b/tests/qemuxml2xmloutdata/serial-target-port-auto.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/serial-target-port-auto.xml
rename to tests/qemuxml2xmloutdata/serial-target-port-auto.x86_64-latest.xml
index b9241e6933..eeb78f7401 100644
--- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml b/tests/qemuxml2xmloutdata/smbios-multiple-type2.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
rename to tests/qemuxml2xmloutdata/smbios-multiple-type2.x86_64-latest.xml
index f4febb1784..dba587b330 100644
--- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.x86_64-latest.xml
@@ -39,6 +39,9 @@
     <boot dev='hd'/>
     <smbios mode='sysinfo'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -54,7 +57,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/smbios.xml b/tests/qemuxml2xmloutdata/smbios.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/smbios.xml
rename to tests/qemuxml2xmloutdata/smbios.x86_64-latest.xml
index 2207fab666..12d416960e 100644
--- a/tests/qemuxml2xmloutdata/smbios.xml
+++ b/tests/qemuxml2xmloutdata/smbios.x86_64-latest.xml
@@ -44,6 +44,9 @@
     <boot dev='hd'/>
     <smbios mode='sysinfo'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -59,7 +62,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/smp.xml b/tests/qemuxml2xmloutdata/smp.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/smp.xml
rename to tests/qemuxml2xmloutdata/smp.x86_64-latest.xml
index 69126bfa7c..a7f324afba 100644
--- a/tests/qemuxml2xmloutdata/smp.xml
+++ b/tests/qemuxml2xmloutdata/smp.x86_64-latest.xml
@@ -8,7 +8,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
@@ -23,7 +24,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/usb-controller.xml b/tests/qemuxml2xmloutdata/usb-controller.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/usb-controller.xml
rename to tests/qemuxml2xmloutdata/usb-controller.x86_64-latest.xml
index d551a5b7ed..c74353b056 100644
--- a/tests/qemuxml2xmloutdata/usb-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller.x86_64-latest.xml
@@ -8,13 +8,16 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml
similarity index 96%
rename from tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
rename to tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml
index 5d0f68c324..058880b2c4 100644
--- a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
+++ b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/usb-none.xml b/tests/qemuxml2xmloutdata/usb-none.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/usb-none.xml
rename to tests/qemuxml2xmloutdata/usb-none.x86_64-latest.xml
index bc06548ad7..880106d79a 100644
--- a/tests/qemuxml2xmloutdata/usb-none.xml
+++ b/tests/qemuxml2xmloutdata/usb-none.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 493f0bc4d5..50e6860dfc 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -203,11 +203,11 @@ mymain(void)
     g_unsetenv("QEMU_AUDIO_DRV");
     g_unsetenv("SDL_AUDIODRIVER");
 
-    DO_TEST_NOCAPS("minimal");
+    DO_TEST_CAPS_LATEST("minimal");
     DO_TEST_CAPS_LATEST("genid");
     DO_TEST_CAPS_LATEST("genid-auto");
-    DO_TEST_NOCAPS("machine-core-on");
-    DO_TEST_NOCAPS("machine-core-off");
+    DO_TEST_CAPS_LATEST("machine-core-on");
+    DO_TEST_CAPS_LATEST("machine-core-off");
     DO_TEST_CAPS_LATEST("machine-smm-on");
     DO_TEST_CAPS_LATEST("machine-smm-off");
     DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x");
@@ -226,20 +226,20 @@ mymain(void)
     DO_TEST_NOCAPS("boot-menu-disable-with-timeout");
     DO_TEST_NOCAPS("boot-order");
 
-    DO_TEST_NOCAPS("reboot-timeout-enabled");
-    DO_TEST_NOCAPS("reboot-timeout-disabled");
+    DO_TEST_CAPS_LATEST("reboot-timeout-enabled");
+    DO_TEST_CAPS_LATEST("reboot-timeout-disabled");
 
-    DO_TEST_NOCAPS("clock-utc");
-    DO_TEST_NOCAPS("clock-localtime");
+    DO_TEST_CAPS_LATEST("clock-utc");
+    DO_TEST_CAPS_LATEST("clock-localtime");
     DO_TEST_NOCAPS("cpu-empty");
-    DO_TEST_NOCAPS("cpu-kvmclock");
+    DO_TEST_CAPS_LATEST("cpu-kvmclock");
     DO_TEST_NOCAPS("cpu-host-kvmclock");
-    DO_TEST_NOCAPS("cpu-host-passthrough-features");
-    DO_TEST_NOCAPS("cpu-host-model-features");
+    DO_TEST_CAPS_LATEST("cpu-host-passthrough-features");
+    DO_TEST_CAPS_LATEST("cpu-host-model-features");
     DO_TEST_NOCAPS("cpu-host-model-vendor");
     DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY);
-    DO_TEST_NOCAPS("kvmclock");
-    DO_TEST_NOCAPS("clock-timer-hyperv-rtc");
+    DO_TEST_CAPS_LATEST("kvmclock");
+    DO_TEST_CAPS_LATEST("clock-timer-hyperv-rtc");
     DO_TEST_CAPS_ARCH_LATEST("clock-timer-armvtimer", "aarch64");
     DO_TEST_CAPS_LATEST("clock-realtime");
     DO_TEST_CAPS_LATEST("clock-absolute");
@@ -260,8 +260,8 @@ mymain(void)
     DO_TEST_CAPS_LATEST("kvm-features");
     DO_TEST_CAPS_LATEST("kvm-features-off");
 
-    DO_TEST_NOCAPS("pmu-feature");
-    DO_TEST_NOCAPS("pmu-feature-off");
+    DO_TEST_CAPS_LATEST("pmu-feature");
+    DO_TEST_CAPS_LATEST("pmu-feature-off");
 
     DO_TEST_NOCAPS("pages-discard");
     DO_TEST_CAPS_LATEST("pages-discard-hugepages");
@@ -279,10 +279,10 @@ mymain(void)
     DO_TEST_CAPS_LATEST("hugepages-memaccess2");
     DO_TEST_CAPS_LATEST("hugepages-memaccess3");
     DO_TEST_CAPS_LATEST("hugepages-nvdimm");
-    DO_TEST_NOCAPS("nosharepages");
-    DO_TEST_NOCAPS("restore-v2");
-    DO_TEST_NOCAPS("migrate");
-    DO_TEST_NOCAPS("qemu-ns-no-env");
+    DO_TEST_CAPS_LATEST("nosharepages");
+    DO_TEST_CAPS_LATEST("restore-v2");
+    DO_TEST_CAPS_LATEST("migrate");
+    DO_TEST_CAPS_LATEST("qemu-ns-no-env");
     DO_TEST_CAPS_LATEST("qemu-ns");
     DO_TEST_NOCAPS("disk-aio");
     DO_TEST_CAPS_LATEST("disk-aio-io_uring");
@@ -327,9 +327,9 @@ mymain(void)
             QEMU_CAPS_SCSI_BLOCK);
     DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST_CAPS_ARCH_LATEST("disk-virtio-s390-zpci", "s390x");
-    DO_TEST_NOCAPS("disk-mirror-old");
-    DO_TEST_NOCAPS("disk-mirror");
-    DO_TEST_NOCAPS("disk-active-commit");
+    DO_TEST_CAPS_LATEST("disk-mirror-old");
+    DO_TEST_CAPS_LATEST("disk-mirror");
+    DO_TEST_CAPS_LATEST("disk-active-commit");
     DO_TEST("graphics-listen-network",
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_VNC);
@@ -415,9 +415,9 @@ mymain(void)
             QEMU_CAPS_EGL_HEADLESS_RENDERNODE,
             QEMU_CAPS_EGL_HEADLESS);
 
-    DO_TEST_NOCAPS("input-usbmouse");
-    DO_TEST_NOCAPS("input-usbtablet");
-    DO_TEST_NOCAPS("misc-acpi");
+    DO_TEST_CAPS_LATEST("input-usbmouse");
+    DO_TEST_CAPS_LATEST("input-usbtablet");
+    DO_TEST_CAPS_LATEST("misc-acpi");
     DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3);
     DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
     DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
@@ -426,20 +426,20 @@ mymain(void)
             QEMU_CAPS_PIIX_DISABLE_S4);
     DO_TEST("misc-enable-s4", QEMU_CAPS_PIIX_DISABLE_S4);
     DO_TEST_NOCAPS("misc-no-reboot");
-    DO_TEST_NOCAPS("misc-uuid");
+    DO_TEST_CAPS_LATEST("misc-uuid");
     DO_TEST_NOCAPS("net-vhostuser");
     DO_TEST_NOCAPS("net-user");
     DO_TEST_CAPS_LATEST("net-user-addr");
     DO_TEST_CAPS_LATEST("net-user-passt");
-    DO_TEST_NOCAPS("net-virtio");
-    DO_TEST_NOCAPS("net-virtio-device");
-    DO_TEST_NOCAPS("net-virtio-disable-offloads");
-    DO_TEST_NOCAPS("net-eth");
-    DO_TEST_NOCAPS("net-eth-ifname");
-    DO_TEST_NOCAPS("net-eth-hostip");
-    DO_TEST_NOCAPS("net-eth-unmanaged-tap");
-    DO_TEST_NOCAPS("net-virtio-network-portgroup");
-    DO_TEST_NOCAPS("net-virtio-rxtxqueuesize");
+    DO_TEST_CAPS_LATEST("net-virtio");
+    DO_TEST_CAPS_LATEST("net-virtio-device");
+    DO_TEST_CAPS_LATEST("net-virtio-disable-offloads");
+    DO_TEST_CAPS_LATEST("net-eth");
+    DO_TEST_CAPS_LATEST("net-eth-ifname");
+    DO_TEST_CAPS_LATEST("net-eth-hostip");
+    DO_TEST_CAPS_LATEST("net-eth-unmanaged-tap");
+    DO_TEST_CAPS_LATEST("net-virtio-network-portgroup");
+    DO_TEST_CAPS_LATEST("net-virtio-rxtxqueuesize");
     DO_TEST("net-virtio-teaming",
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("net-virtio-teaming-network",
@@ -447,11 +447,11 @@ mymain(void)
     DO_TEST("net-virtio-teaming-hostdev",
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST_CAPS_LATEST("net-isolated-port");
-    DO_TEST_NOCAPS("net-hostdev");
-    DO_TEST_NOCAPS("net-hostdev-bootorder");
+    DO_TEST_CAPS_LATEST("net-hostdev");
+    DO_TEST_CAPS_LATEST("net-hostdev-bootorder");
     DO_TEST("net-hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST_NOCAPS("net-midonet");
-    DO_TEST_NOCAPS("net-openvswitch");
+    DO_TEST_CAPS_LATEST("net-midonet");
+    DO_TEST_CAPS_LATEST("net-openvswitch");
     DO_TEST_CAPS_LATEST("sound-device");
     DO_TEST_NOCAPS("watchdog");
     DO_TEST_CAPS_LATEST("watchdog-q35-multiple");
@@ -475,11 +475,11 @@ mymain(void)
 
     DO_TEST_NOCAPS("serial-debugcon");
     DO_TEST_NOCAPS("console-compat");
-    DO_TEST_NOCAPS("console-compat2");
-    DO_TEST_NOCAPS("console-virtio-many");
-    DO_TEST_NOCAPS("channel-guestfwd");
-    DO_TEST_NOCAPS("channel-virtio");
-    DO_TEST_NOCAPS("channel-virtio-state");
+    DO_TEST_CAPS_LATEST("console-compat2");
+    DO_TEST_CAPS_LATEST("console-virtio-many");
+    DO_TEST_CAPS_LATEST("channel-guestfwd");
+    DO_TEST_CAPS_LATEST("channel-virtio");
+    DO_TEST_CAPS_LATEST("channel-virtio-state");
 
     DO_TEST_NOCAPS("channel-unix-source-path");
 
@@ -502,7 +502,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_VFIO_PCI,
             QEMU_CAPS_VNC);
     DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb");
-    DO_TEST_NOCAPS("pci-rom");
+    DO_TEST_CAPS_LATEST("pci-rom");
     DO_TEST_NOCAPS("pci-rom-disabled");
     DO_TEST_NOCAPS("pci-rom-disabled-invalid");
     DO_TEST_NOCAPS("pci-serial-dev-chardev");
@@ -515,10 +515,10 @@ mymain(void)
     DO_TEST_CAPS_LATEST("luks-disks");
     DO_TEST_CAPS_LATEST("luks-disks-source");
     DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
-    DO_TEST_NOCAPS("memtune");
-    DO_TEST_NOCAPS("memtune-unlimited");
-    DO_TEST_NOCAPS("blkiotune");
-    DO_TEST_NOCAPS("blkiotune-device");
+    DO_TEST_CAPS_LATEST("memtune");
+    DO_TEST_CAPS_LATEST("memtune-unlimited");
+    DO_TEST_CAPS_LATEST("blkiotune");
+    DO_TEST_CAPS_LATEST("blkiotune-device");
     DO_TEST_CAPS_LATEST("cputune");
     DO_TEST_CAPS_LATEST("cputune-zero-shares");
     DO_TEST_CAPS_LATEST("cputune-numatune");
@@ -526,7 +526,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("cputune-cpuset-big-id");
     DO_TEST_CAPS_LATEST("numavcpus-topology-mismatch");
 
-    DO_TEST_NOCAPS("smp");
+    DO_TEST_CAPS_LATEST("smp");
     DO_TEST_CAPS_LATEST("iothreads-ids");
     DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes");
     DO_TEST_CAPS_LATEST("iothreads-ids-partial");
@@ -534,15 +534,15 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("iothreads-disk-virtio-ccw", "s390x");
     DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci");
     DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x");
-    DO_TEST_NOCAPS("lease");
+    DO_TEST_CAPS_LATEST("lease");
     DO_TEST_NOCAPS("event_idx");
     DO_TEST_NOCAPS("vhost_queues");
     DO_TEST_NOCAPS("interface-driver");
-    DO_TEST_NOCAPS("net-server");
+    DO_TEST_CAPS_LATEST("net-server");
     DO_TEST_NOCAPS("virtio-lun");
 
-    DO_TEST_NOCAPS("usb-none");
-    DO_TEST_NOCAPS("usb-controller");
+    DO_TEST_CAPS_LATEST("usb-none");
+    DO_TEST_CAPS_LATEST("usb-controller");
     DO_TEST("usb-piix3-controller",
             QEMU_CAPS_PIIX3_USB_UHCI);
     DO_TEST("usb-controller-default-q35",
@@ -583,17 +583,17 @@ mymain(void)
     DO_TEST_FULL("seclabel-dynamic-override", "", WHEN_INACTIVE, ARG_END);
     DO_TEST_FULL("seclabel-dynamic-labelskip", "", WHEN_INACTIVE, ARG_END);
     DO_TEST_FULL("seclabel-dynamic-relabel", "", WHEN_INACTIVE, ARG_END);
-    DO_TEST_NOCAPS("seclabel-static");
-    DO_TEST_NOCAPS("seclabel-static-labelskip");
-    DO_TEST_NOCAPS("seclabel-none");
-    DO_TEST_NOCAPS("seclabel-dac-none");
-    DO_TEST_NOCAPS("seclabel-dynamic-none");
-    DO_TEST_NOCAPS("seclabel-device-multiple");
+    DO_TEST_CAPS_LATEST("seclabel-static");
+    DO_TEST_CAPS_LATEST("seclabel-static-labelskip");
+    DO_TEST_CAPS_LATEST("seclabel-none");
+    DO_TEST_CAPS_LATEST("seclabel-dac-none");
+    DO_TEST_CAPS_LATEST("seclabel-dynamic-none");
+    DO_TEST_CAPS_LATEST("seclabel-device-multiple");
     DO_TEST_FULL("seclabel-dynamic-none-relabel", "", WHEN_INACTIVE,
                  ARG_QEMU_CAPS, QEMU_CAPS_DEVICE_CIRRUS_VGA,
                  QEMU_CAPS_SPICE, QEMU_CAPS_LAST,
                  ARG_END);
-    DO_TEST_NOCAPS("numad-static-vcpu-no-numatune");
+    DO_TEST_CAPS_LATEST("numad-static-vcpu-no-numatune");
 
     DO_TEST("disk-scsi-disk-vpd",
             QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
@@ -649,21 +649,21 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-native", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-virtio", "aarch64");
 
-    DO_TEST_NOCAPS("balloon-device-auto");
-    DO_TEST_NOCAPS("balloon-device-period");
-    DO_TEST_NOCAPS("channel-virtio-auto");
+    DO_TEST_CAPS_LATEST("balloon-device-auto");
+    DO_TEST_CAPS_LATEST("balloon-device-period");
+    DO_TEST_CAPS_LATEST("channel-virtio-auto");
     DO_TEST_NOCAPS("console-compat-auto");
     DO_TEST("disk-scsi-device-auto",
             QEMU_CAPS_SCSI_LSI);
-    DO_TEST_NOCAPS("console-virtio");
-    DO_TEST_NOCAPS("serial-target-port-auto");
+    DO_TEST_CAPS_LATEST("console-virtio");
+    DO_TEST_CAPS_LATEST("serial-target-port-auto");
     DO_TEST("graphics-listen-network2",
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_VNC);
-    DO_TEST_NOCAPS("numad-auto-vcpu-no-numatune");
-    DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement");
-    DO_TEST_NOCAPS("numad-auto-memory-vcpu-cpuset");
-    DO_TEST_NOCAPS("usb-ich9-ehci-addr");
+    DO_TEST_CAPS_LATEST("numad-auto-vcpu-no-numatune");
+    DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement");
+    DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset");
+    DO_TEST_CAPS_LATEST("usb-ich9-ehci-addr");
     DO_TEST_NOCAPS("disk-copy_on_read");
     DO_TEST_CAPS_LATEST("tpm-passthrough");
     DO_TEST_CAPS_LATEST("tpm-passthrough-crb");
@@ -675,8 +675,8 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("aarch64-tpm", "aarch64");
     DO_TEST_CAPS_LATEST("tpm-external");
 
-    DO_TEST_NOCAPS("metadata");
-    DO_TEST_NOCAPS("metadata-duplicate");
+    DO_TEST_CAPS_LATEST("metadata");
+    DO_TEST_CAPS_LATEST("metadata-duplicate");
 
     DO_TEST("pci-bridge",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -933,8 +933,8 @@ mymain(void)
     DO_TEST("shmem", QEMU_CAPS_DEVICE_IVSHMEM);
     DO_TEST("shmem-plain-doorbell",
             QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
-    DO_TEST_NOCAPS("smbios");
-    DO_TEST_NOCAPS("smbios-multiple-type2");
+    DO_TEST_CAPS_LATEST("smbios");
+    DO_TEST_CAPS_LATEST("smbios-multiple-type2");
     DO_TEST_CAPS_LATEST("smbios-type-fwcfg");
 
     DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64");
@@ -1016,7 +1016,7 @@ mymain(void)
 
     DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-ppc64-nonuma", "ppc64");
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-ppc64-nonuma-abi-update", "ppc64");
-    DO_TEST_NOCAPS("memory-hotplug");
+    DO_TEST_CAPS_LATEST("memory-hotplug");
     DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM);
     DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr");
     DO_TEST("memory-hotplug-nvdimm", QEMU_CAPS_DEVICE_NVDIMM);
@@ -1032,7 +1032,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("memory-hotplug-virtio-mem");
     DO_TEST_CAPS_LATEST("memory-hotplug-multiple");
 
-    DO_TEST_NOCAPS("net-udp");
+    DO_TEST_CAPS_LATEST("net-udp");
 
     DO_TEST("video-virtio-gpu-device", QEMU_CAPS_DEVICE_VIRTIO_GPU);
     DO_TEST("video-virtio-gpu-virgl",
@@ -1058,8 +1058,8 @@ mymain(void)
 
     DO_TEST_CAPS_LATEST("input-linux");
 
-    DO_TEST_NOCAPS("memorybacking-set");
-    DO_TEST_NOCAPS("memorybacking-unset");
+    DO_TEST_CAPS_LATEST("memorybacking-set");
+    DO_TEST_CAPS_LATEST("memorybacking-unset");
 
     DO_TEST_CAPS_LATEST("virtio-options");