diff --git a/test/vhost/common/common.sh b/test/vhost/common/common.sh
index 0ac671759..b310e76b0 100644
--- a/test/vhost/common/common.sh
+++ b/test/vhost/common/common.sh
@@ -612,7 +612,7 @@ function vm_setup()
 					notice "Using existing image $raw_disk"
 				fi
 
-				cmd+="-device virtio-scsi-pci ${eol}"
+				cmd+="-device virtio-scsi-pci,num_queues=$queue_number ${eol}"
 				cmd+="-device scsi-hd,drive=hd$i,vendor=$raw_name ${eol}"
 				cmd+="-drive if=none,id=hd$i,file=$raw_disk,format=raw$raw_cache ${eol}"
 				;;
diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh
index cba475234..3b4525fde 100755
--- a/test/vhost/initiator/blockdev.sh
+++ b/test/vhost/initiator/blockdev.sh
@@ -104,7 +104,8 @@ timing_exit run_spdk_fio_unmap
 
 timing_enter setup_vm
 vm_no="0"
-vm_setup --disk-type=spdk_vhost_scsi --force=$vm_no --os=$os_image --disks="Nvme0n1:Malloc0:Malloc1" --queue_num=18 --memory=6144
+vm_setup --disk-type=spdk_vhost_scsi --force=$vm_no --os=$os_image --disks="Nvme0n1:Malloc0:Malloc1:Virtio0,virtio" \
+ --queue_num=18 --memory=6144
 vm_run $vm_no
 
 timing_enter vm_wait_for_boot