diff --git a/qemu/tests/cfg/block_hotplug.cfg b/qemu/tests/cfg/block_hotplug.cfg
index d1586e7fb59dfbfa4e70ce9d89b1b7916c118ce0..2321926f590bb7b155c02e09d814822f2a6bab56 100644
--- a/qemu/tests/cfg/block_hotplug.cfg
+++ b/qemu/tests/cfg/block_hotplug.cfg
@@ -84,6 +84,8 @@
     variants:
         - block_virtio:
             pci_type = virtio-blk-pci
+            s390x:
+                pci_type = virtio-blk-ccw
             drive_format_stg0 = virtio
             drive_format_stg1 = virtio
             get_disk_pattern = "^/dev/vd[a-z]*$"
@@ -95,6 +97,8 @@
             virtio_blk:
                 need_controller = yes
                 controller_model = virtio-scsi-pci
+                s390x:
+                    controller_model = virtio-scsi-ccw
 
     variants:
         - @default: