diff --git a/test/cfg2cmd/cputype-icelake-client-deprecation.conf b/test/cfg2cmd/cputype-icelake-client-deprecation.conf
index 523dd275..2f595162 100644
--- a/test/cfg2cmd/cputype-icelake-client-deprecation.conf
+++ b/test/cfg2cmd/cputype-icelake-client-deprecation.conf
@@ -1,5 +1,4 @@
 # TEST: test CPU type depreacation for Icelake-Client (never existed in the wild)
-# QEMU_VERSION: 7.1
 bootdisk: scsi0
 cores: 2
 cpu: Icelake-Client
diff --git a/test/cfg2cmd/netdev-7.0-multiqueues.conf b/test/cfg2cmd/netdev-7.0-multiqueues.conf
index 342ad886..e55f5c93 100644
--- a/test/cfg2cmd/netdev-7.0-multiqueues.conf
+++ b/test/cfg2cmd/netdev-7.0-multiqueues.conf
@@ -1,7 +1,7 @@
 # TEST: Simple test for netdev multi queue on 7.0 machine version
-# QEMU_VERSION: 7.0
 bootdisk: scsi0
 cores: 3
+machine: pc-i440fx-7.0
 memory: 768
 name: netdev-multiq
 net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0,mtu=900,queues=2
diff --git a/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd b/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd
index 6892de34..a6f8a827 100644
--- a/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd
+++ b/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd
@@ -24,4 +24,4 @@
   -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
   -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/qemu-server/pve-bridgedown,vhost=on,queues=2' \
   -device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,vectors=6,mq=on,bootindex=300,host_mtu=900' \
-  -machine 'type=pc+pve0'
+  -machine 'type=pc-i440fx-7.0+pve0'
diff --git a/test/cfg2cmd/netdev-7.1-multiqueues.conf b/test/cfg2cmd/netdev-7.1-multiqueues.conf
index da5f111d..162bd9c5 100644
--- a/test/cfg2cmd/netdev-7.1-multiqueues.conf
+++ b/test/cfg2cmd/netdev-7.1-multiqueues.conf
@@ -1,5 +1,4 @@
 # TEST: Simple test for netdev related stuff
-# QEMU_VERSION: 7.1
 bootdisk: scsi0
 cores: 3
 memory: 768
diff --git a/test/cfg2cmd/netdev-7.1.conf b/test/cfg2cmd/netdev-7.1.conf
index 82be0566..8ae0673e 100644
--- a/test/cfg2cmd/netdev-7.1.conf
+++ b/test/cfg2cmd/netdev-7.1.conf
@@ -1,5 +1,4 @@
 # TEST: Simple test for netdev related stuff
-# QEMU_VERSION: 7.1
 bootdisk: scsi0
 cores: 3
 memory: 768
diff --git a/test/cfg2cmd/ostype-usb13-error.conf b/test/cfg2cmd/ostype-usb13-error.conf
index 5c75b620..f8e4397d 100644
--- a/test/cfg2cmd/ostype-usb13-error.conf
+++ b/test/cfg2cmd/ostype-usb13-error.conf
@@ -1,5 +1,4 @@
 # TEST: Test error for old ostype type with newer usb config
-# QEMU_VERSION: 7.1.0
 # EXPECT_ERROR: using usb13 is only possible with machine type >= 7.1 and ostype l26 or windows > 7
 cores: 2
 memory: 768
diff --git a/test/cfg2cmd/q35-simple-7.0.conf b/test/cfg2cmd/q35-simple-7.0.conf
index 4618e23d..9e3097ee 100644
--- a/test/cfg2cmd/q35-simple-7.0.conf
+++ b/test/cfg2cmd/q35-simple-7.0.conf
@@ -1,10 +1,9 @@
 # TEST: Config with q35, Linux & nothing much else but on 7.0
-# QEMU_VERSION: 7.0.0
 bios: ovmf
 bootdisk: scsi0
 cores: 2
 efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
-machine: q35
+machine: pc-q35-7.0
 meta: creation-qemu=6.1
 memory: 512
 net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
diff --git a/test/cfg2cmd/q35-simple-7.0.conf.cmd b/test/cfg2cmd/q35-simple-7.0.conf.cmd
index 9344f5a9..efd57bb7 100644
--- a/test/cfg2cmd/q35-simple-7.0.conf.cmd
+++ b/test/cfg2cmd/q35-simple-7.0.conf.cmd
@@ -25,4 +25,4 @@
   -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
   -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/qemu-server/pve-bridgedown,vhost=on' \
   -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
-  -machine 'type=q35+pve0'
+  -machine 'type=pc-q35-7.0+pve0'
diff --git a/test/cfg2cmd/qemu-xhci-7.1.conf b/test/cfg2cmd/qemu-xhci-7.1.conf
index e7cac65e..b09d37bf 100644
--- a/test/cfg2cmd/qemu-xhci-7.1.conf
+++ b/test/cfg2cmd/qemu-xhci-7.1.conf
@@ -1,6 +1,6 @@
 # TEST: Test for new xhci controller with new machine version
-# QEMU_VERSION: 7.1.0
 cores: 2
+machine: pc-i440fx-7.1
 memory: 768
 name: spiceusb3
 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
diff --git a/test/cfg2cmd/qemu-xhci-7.1.conf.cmd b/test/cfg2cmd/qemu-xhci-7.1.conf.cmd
index 2492e57e..fd1456aa 100644
--- a/test/cfg2cmd/qemu-xhci-7.1.conf.cmd
+++ b/test/cfg2cmd/qemu-xhci-7.1.conf.cmd
@@ -34,4 +34,4 @@
   -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
   -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/qemu-server/pve-bridgedown,vhost=on' \
   -device 'virtio-net-pci,mac=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \
-  -machine 'type=pc+pve0'
+  -machine 'type=pc-i440fx-7.1+pve0'
diff --git a/test/cfg2cmd/qemu-xhci-q35-7.1.conf b/test/cfg2cmd/qemu-xhci-q35-7.1.conf
index 40a59010..7740e54f 100644
--- a/test/cfg2cmd/qemu-xhci-q35-7.1.conf
+++ b/test/cfg2cmd/qemu-xhci-q35-7.1.conf
@@ -1,5 +1,4 @@
 # TEST: Test Q35 USB passthrough combination with qemu-xhci
-# QEMU_VERSION: 7.1.0
 cores: 2
 memory: 768
 name: q35-qemu-xhci