diff --git a/nova/tests/test_libvirt_blockinfo.py b/nova/tests/test_libvirt_blockinfo.py
index 5560e63f..87a76cca 100644
--- a/nova/tests/test_libvirt_blockinfo.py
+++ b/nova/tests/test_libvirt_blockinfo.py
@@ -419,13 +419,13 @@ class LibvirtBlockInfoTest(test.TestCase):
                                                      device_type='cdrom')
         self.assertEqual(bus, 'ide')
 
-        image_meta = {'properties': {'disk_bus': 'scsi'}}
+        image_meta = {'properties': {'hw_disk_bus': 'scsi'}}
         bus = blockinfo.get_disk_bus_for_device_type('kvm',
                                                      image_meta)
         self.assertEqual(bus, 'scsi')
 
-        image_meta = {'properties': {'disk_bus': 'usb',
-                                     'cdrom_bus': 'scsi'}}
+        image_meta = {'properties': {'hw_disk_bus': 'usb',
+                                     'hw_cdrom_bus': 'scsi'}}
         bus = blockinfo.get_disk_bus_for_device_type('kvm',
                                                      image_meta,
                                                      device_type='cdrom')
@@ -435,7 +435,7 @@ class LibvirtBlockInfoTest(test.TestCase):
                                                      image_meta)
         self.assertEqual(bus, 'usb')
 
-        image_meta = {'properties': {'disk_bus': 'xen'}}
+        image_meta = {'properties': {'hw_disk_bus': 'xen'}}
         self.assertRaises(exception.UnsupportedHardware,
                           blockinfo.get_disk_bus_for_device_type,
                           'kvm',
diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py
index 026e55e9..6160105c 100644
--- a/nova/tests/test_libvirt_vif.py
+++ b/nova/tests/test_libvirt_vif.py
@@ -277,7 +277,7 @@ class LibvirtVifTestCase(test.TestCase):
             return fakelibvirt.Connection("qemu:///session",
                                           False)
         d = vif.LibvirtGenericVIFDriver(get_connection)
-        image_meta = {'properties': {'vif_model': 'e1000'}}
+        image_meta = {'properties': {'hw_vif_model': 'e1000'}}
         xml = self._get_instance_xml(d,
                                      self.net_bridge,
                                      self.mapping_bridge,
@@ -301,7 +301,7 @@ class LibvirtVifTestCase(test.TestCase):
             return fakelibvirt.Connection("qemu:///session",
                                           False)
         d = vif.LibvirtGenericVIFDriver(get_connection)
-        image_meta = {'properties': {'vif_model': 'acme'}}
+        image_meta = {'properties': {'hw_vif_model': 'acme'}}
         self.assertRaises(exception.UnsupportedHardware,
                           self._get_instance_xml,
                           d,