diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
index 231785d87872b274b488b47aa52cb6d9c93f36fe..eadbba352a5077a8957177d35827237840ddb8b3 100644
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml
index 60a38ade247cca7115306975b075e78ed851ffc9..76ce780b6798f718992d7016d75dcf68b78de787 100644
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml
@@ -6,7 +6,7 @@
   <vcpu placement='static'>1</vcpu>
   <iothreads>2</iothreads>
   <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
index 668402b041aba64eb1ead37cf34dcec09051d780..1b4af038323028e20b17e1b5f26f1db3792fb36e 100644
--- a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
@@ -6,7 +6,7 @@
   <vcpu placement='static'>1</vcpu>
   <iothreads>2</iothreads>
   <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>