diff --git a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args
index 1e7eaacad0..485b121a08 100644
--- a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args
@@ -26,15 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
--device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0.0001"}' \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
--chardev pty,id=charconsole0 \
--device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0002"}' \
--object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}' \
--device '{"driver":"virtio-rng-ccw","rng":"objrng0","id":"rng0","devno":"fe.0.0003"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml
index 392f03fbc6..595d0b1a1e 100644
--- a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml
+++ b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml
@@ -6,6 +6,7 @@
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+    <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>qemu</model>
@@ -16,33 +17,14 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='virtio'/>
-      <boot order='1'/>
-      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
-    </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'>
         <zpci uid='0x0001' fid='0x00000000'/>
       </address>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
-    <controller type='virtio-serial' index='0'>
-      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
-    </controller>
-    <console type='pty'>
-      <target type='virtio' port='0'/>
-    </console>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/hwrng</backend>
-      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/>
-    </rng>
+    <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
 </domain>
diff --git a/tests/qemuxmlconfdata/s390-usb-address.xml b/tests/qemuxmlconfdata/s390-usb-address.xml
index 5afc23dbba..54d55f6e4c 100644
--- a/tests/qemuxmlconfdata/s390-usb-address.xml
+++ b/tests/qemuxmlconfdata/s390-usb-address.xml
@@ -2,31 +2,14 @@
   <name>test</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory>219100</memory>
-  <currentMemory>219100</currentMemory>
   <os>
     <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
   </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-s390x</emulator>
-    <disk type='block' device='disk'>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='virtio'/>
-      <boot order='1'/>
-    </disk>
-    <console type='pty'>
-      <target type='virtio'/>
-    </console>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
-    <memballoon model='virtio'>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/hwrng</backend>
-    </rng>
+    <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args
index 1e7eaacad0..485b121a08 100644
--- a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args
@@ -26,15 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
--device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0.0001"}' \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
--chardev pty,id=charconsole0 \
--device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0002"}' \
--object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}' \
--device '{"driver":"virtio-rng-ccw","rng":"objrng0","id":"rng0","devno":"fe.0.0003"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml
index 97a14b63f7..e17098a3df 100644
--- a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml
+++ b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml
@@ -6,6 +6,7 @@
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+    <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>qemu</model>
@@ -16,29 +17,10 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='virtio'/>
-      <boot order='1'/>
-      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
-    </disk>
     <controller type='usb' index='0' model='none'/>
     <controller type='pci' index='0' model='pci-root'/>
-    <controller type='virtio-serial' index='0'>
-      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
-    </controller>
-    <console type='pty'>
-      <target type='virtio' port='0'/>
-    </console>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/hwrng</backend>
-      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/>
-    </rng>
+    <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
 </domain>
diff --git a/tests/qemuxmlconfdata/s390-usb-none.xml b/tests/qemuxmlconfdata/s390-usb-none.xml
index c0b2da6569..ca81ff92dd 100644
--- a/tests/qemuxmlconfdata/s390-usb-none.xml
+++ b/tests/qemuxmlconfdata/s390-usb-none.xml
@@ -2,29 +2,12 @@
   <name>test</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory>219100</memory>
-  <currentMemory>219100</currentMemory>
   <os>
     <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
   </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-s390x</emulator>
-    <disk type='block' device='disk'>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='virtio'/>
-      <boot order='1'/>
-    </disk>
-    <console type='pty'>
-      <target type='virtio'/>
-    </console>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='usb' index='0' model='none'/>
-    <memballoon model='virtio'>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/hwrng</backend>
-    </rng>
+    <memballoon model='none'/>
   </devices>
 </domain>