diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py
index 56fa5d34c71a..6c0f3342bfd2 100644
--- a/nova/tests/unit/virt/libvirt/test_driver.py
+++ b/nova/tests/unit/virt/libvirt/test_driver.py
@@ -10651,7 +10651,6 @@ class LibvirtConnTestCase(test.NoDBTestCase,
             self.assertTrue(drvr._is_shared_block_storage(instance, data,
                                   block_device_info=bdi))
         self.assertEqual(0, mock_get_instance_disk_info.call_count)
-        self.assertTrue(drvr._is_storage_shared_with('foo', 'bar'))
 
     def test_is_shared_block_storage_lvm(self):
         self.flags(images_type='lvm', group='libvirt')
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index d133c8167479..6c20d6f88937 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -9663,10 +9663,6 @@ class LibvirtDriver(driver.ComputeDriver):
         #             on the same filesystem: the source and dest IP are the
         #             same, or we create a file on the dest system via SSH
         #             and check whether the source system can also see it.
-        # NOTE (drwahl): Actually, there is a 3rd way: if images_type is rbd,
-        #                it will always be shared storage
-        if CONF.libvirt.images_type == 'rbd':
-            return True
         shared_storage = (dest == self.get_host_ip_addr())
         if not shared_storage:
             tmp_file = uuidutils.generate_uuid(dashed=False) + '.tmp'