diff --git a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
index d07006fe64..cdfa9dd447 100644
--- a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-rhel7/.config \
 -name guest=rhel7,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-rhel7/master-key.aes"}' \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel kvm \
 -cpu qemu64 \
 -m size=2097152k \
diff --git a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml
index 7692ffca5f..63197d5f33 100644
--- a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/controller-usb-order.xml b/tests/qemuxmlconfdata/controller-usb-order.xml
index 6cc0f503ff..c227e54a9e 100644
--- a/tests/qemuxmlconfdata/controller-usb-order.xml
+++ b/tests/qemuxmlconfdata/controller-usb-order.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args
index 76a61dc985..de6bcb3db2 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -name guest=encryptdisk,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \
--machine pc-i440fx-2.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.xml
index e3a9463e43..20201a51a7 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml
index 8c2c008dc3..448e263832 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args
index 734f63b31e..af178782b9 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -name guest=encryptdisk,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \
--machine pc-i440fx-2.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml
index d9f4ad17d9..9eb8071925 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml
index 37d9900e74..bd28d0b6e5 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
index b5c2e16cb0..4b6afbb85d 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -name guest=encryptdisk,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \
--machine pc-i440fx-2.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml
index 99bba52db5..c7f4571a05 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml
index d1fcf2da61..d45f7e71c8 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxmlconfdata/luks-disk-invalid.xml b/tests/qemuxmlconfdata/luks-disk-invalid.xml
index bea769584b..36c7e92980 100644
--- a/tests/qemuxmlconfdata/luks-disk-invalid.xml
+++ b/tests/qemuxmlconfdata/luks-disk-invalid.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
index a4de92bb31..6eedd9a33f 100644
--- a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -name guest=encryptdisk,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \
--machine pc-i440fx-2.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml
index ed9df66413..6e5f495c4c 100644
--- a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/luks-disks-source.xml b/tests/qemuxmlconfdata/luks-disks-source.xml
index 293877df9e..a16f088fbb 100644
--- a/tests/qemuxmlconfdata/luks-disks-source.xml
+++ b/tests/qemuxmlconfdata/luks-disks-source.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
index 2788fe4fc1..a8dc1b4f53 100644
--- a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -name guest=encryptdisk,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \
--machine pc-i440fx-2.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/luks-disks.xml b/tests/qemuxmlconfdata/luks-disks.xml
index 93718daaf4..e430ac0585 100644
--- a/tests/qemuxmlconfdata/luks-disks.xml
+++ b/tests/qemuxmlconfdata/luks-disks.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
index f850d7be60..ad4620175e 100644
--- a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -name guest=instance-00000092,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}' \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,acpi=off \
 -accel kvm \
 -cpu qemu64 \
 -m size=14680064k \
diff --git a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml
index a70bd53134..4ff3892adf 100644
--- a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml
+++ b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml
@@ -14,7 +14,7 @@
     <memnode cellid='0' mode='preferred' nodeset='3'/>
   </numatune>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
index dbe2b82a56..861d9fb18c 100644
--- a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -name guest=instance-00000092,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}' \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off,nvdimm=on,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,nvdimm=on,acpi=off \
 -accel kvm \
 -cpu qemu64 \
 -m size=14680064k,slots=16,maxmem=1099511627776k \
diff --git a/tests/qemuxmlconfdata/memfd-memory-numa.xml b/tests/qemuxmlconfdata/memfd-memory-numa.xml
index 0c5d7ba4ef..0b1464feba 100644
--- a/tests/qemuxmlconfdata/memfd-memory-numa.xml
+++ b/tests/qemuxmlconfdata/memfd-memory-numa.xml
@@ -17,7 +17,7 @@
     <memnode cellid='0' mode='preferred' nodeset='3'/>
   </numatune>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
index 72b025c2f6..0d4866d277 100644
--- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
@@ -10,14 +10,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-dummy/.config \
 -name guest=dummy,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-dummy/master-key.aes"}' \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,acpi=off \
 -accel kvm \
 -cpu qemu64 \
 -m size=7864320k,slots=16,maxmem=16777216k \
 -overcommit mem-lock=off \
 -smp 12,sockets=12,cores=1,threads=1 \
--numa node,nodeid=0,cpus=0-1,cpus=5,cpus=7-11,mem=3840 \
--numa node,nodeid=1,cpus=2-4,cpus=6,mem=3840 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":4026531840,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=0,cpus=0-1,cpus=5,cpus=7-11,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":4026531840,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=1,cpus=2-4,cpus=6,memdev=ram-node1 \
 -uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \
 -display none \
 -no-user-config \
diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml
index fdf7e83587..13ed2e5eee 100644
--- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml
@@ -9,7 +9,7 @@
     <memory mode='strict' placement='auto'/>
   </numatune>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml
index d3b2c1297e..6f512100f2 100644
--- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml
+++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml
@@ -9,7 +9,7 @@
     <memory mode='strict' placement='auto'/>
   </numatune>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>