diff --git a/qemu/tests/cfg/virtio_scsi_mq.cfg b/qemu/tests/cfg/virtio_scsi_mq.cfg
index 0ffbd649de104d90c60a33ed273e1d7e2f7a1570..4b3b9e9d39b6f3fd02f232d3d2acda22cd8f4037 100644
--- a/qemu/tests/cfg/virtio_scsi_mq.cfg
+++ b/qemu/tests/cfg/virtio_scsi_mq.cfg
@@ -9,5 +9,5 @@
     start_vm = no
     image_size_extra_images = 512M
     q35:
-        system_image_drive_format = ahci
         dev_type = q35-pcihost
+    system_image_drive_format = virtio_blk
diff --git a/qemu/tests/virtio_scsi_mq.py b/qemu/tests/virtio_scsi_mq.py
index ef2607e8aad98ce0836732a42ce83168eb2ed059..ee67357ea583cb2a4ff5a08a79c2770f3ed5392d 100644
--- a/qemu/tests/virtio_scsi_mq.py
+++ b/qemu/tests/virtio_scsi_mq.py
@@ -65,7 +65,8 @@ def run(test, params, env):
     images_num = int(num_queues)
     extra_image_size = params.get("image_size_extra_images", "512M")
     system_image = params.get("images")
-    system_image_drive_format = params.get("system_image_drive_format", "ide")
+    system_image_drive_format = params.get("system_image_drive_format",
+                                           "virtio_blk")
     params["drive_format_%s" % system_image] = system_image_drive_format
 
     error.context("Boot up guest with block devcie with num_queues"