diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040
index 2a54f9ad21..caf286571a 100755
--- a/tests/qemu-iotests/040
+++ b/tests/qemu-iotests/040
@@ -761,7 +761,7 @@ class TestCommitWithFilters(iotests.QMPTestCase):
 
         self.do_test_io('write')
 
-        self.vm = iotests.VM()
+        self.vm = iotests.VM().add_device('virtio-scsi,id=vio-scsi')
         self.vm.launch()
 
         result = self.vm.qmp('object-add', qom_type='throttle-group', id='tg')
@@ -862,8 +862,8 @@ class TestCommitWithFilters(iotests.QMPTestCase):
         # Add a device, so the commit job finds a parent it can change
         # to point to the base node (so we can test that top-filter is
         # dropped from the graph)
-        result = self.vm.qmp('device_add', id='drv0', driver='virtio-blk',
-                             drive='top-filter')
+        result = self.vm.qmp('device_add', id='drv0', driver='scsi-hd',
+                             bus='vio-scsi.0', drive='top-filter')
         self.assert_qmp(result, 'return', {})
 
         # Try to release our reference to top-filter; that should not
@@ -889,7 +889,7 @@ class TestCommitWithFilters(iotests.QMPTestCase):
 
         # Check that drv0 is now connected to cow-2
         blockdevs = self.vm.qmp('query-block')['return']
-        drv0 = next(dev for dev in blockdevs if '/drv0' in dev['qdev'])
+        drv0 = next(dev for dev in blockdevs if dev['qdev'] == 'drv0')
         self.assertEqual(drv0['inserted']['node-name'], 'cow-2')
 
         # 3 has been comitted into 2
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index cdbef3ba20..a7780853cd 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -1300,7 +1300,7 @@ class TestFilters(iotests.QMPTestCase):
         qemu_io('-c', 'write -P 1 0 512k', backing_img)
         qemu_io('-c', 'write -P 2 512k 512k', test_img)
 
-        self.vm = iotests.VM()
+        self.vm = iotests.VM().add_device('virtio-scsi,id=vio-scsi')
         self.vm.launch()
 
         result = self.vm.qmp('blockdev-add', **{
@@ -1374,9 +1374,9 @@ class TestFilters(iotests.QMPTestCase):
 
         # We need this so we can query from above the mirror node
         result = self.vm.qmp('device_add',
-                             driver='virtio-blk',
+                             driver='scsi-hd',
                              id='virtio',
-                             bus='pci.0',
+                             bus='vio-scsi.0',
                              drive='source')
         self.assert_qmp(result, 'return', {})
 
@@ -1389,8 +1389,8 @@ class TestFilters(iotests.QMPTestCase):
 
         # The mirror filter is now an implicit node, so it should be
         # invisible when querying the backing chain
-        device_info = self.vm.qmp('query-block')['return'][0]
-        assert device_info['qdev'] == '/machine/peripheral/virtio/virtio-backend'
+        blockdevs = self.vm.qmp('query-block')['return']
+        device_info = next(dev for dev in blockdevs if dev['qdev'] == 'virtio')
 
         assert device_info['inserted']['node-name'] == 'source'
 
@@ -1408,9 +1408,9 @@ class TestFilters(iotests.QMPTestCase):
 
         # We need this so we can query from above the mirror node
         result = self.vm.qmp('device_add',
-                             driver='virtio-blk',
+                             driver='scsi-hd',
                              id='virtio',
-                             bus='pci.0',
+                             bus='vio-scsi.0',
                              drive='source')
         self.assert_qmp(result, 'return', {})
 
@@ -1424,8 +1424,8 @@ class TestFilters(iotests.QMPTestCase):
 
         # With a node-name given to it, the mirror filter should now
         # be visible
-        device_info = self.vm.qmp('query-block')['return'][0]
-        assert device_info['qdev'] == '/machine/peripheral/virtio/virtio-backend'
+        blockdevs = self.vm.qmp('query-block')['return']
+        device_info = next(dev for dev in blockdevs if dev['qdev'] == 'virtio')
 
         assert device_info['inserted']['node-name'] == 'mirror-filter'