diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py
index bdf958659..ffa3587d7 100644
--- a/novaclient/tests/unit/v2/test_shell.py
+++ b/novaclient/tests/unit/v2/test_shell.py
@@ -292,13 +292,6 @@ class ShellTest(utils.TestCase):
                 'flavorRef': '1',
                 'name': 'some-server',
                 'block_device_mapping_v2': [
-                    {
-                        'uuid': 1,
-                        'source_type': 'image',
-                        'destination_type': 'local',
-                        'boot_index': 0,
-                        'delete_on_termination': True,
-                    },
                     {
                         'uuid': 'fake-id',
                         'source_type': 'volume',
diff --git a/novaclient/v2/servers.py b/novaclient/v2/servers.py
index 36de45b7f..8055f1509 100644
--- a/novaclient/v2/servers.py
+++ b/novaclient/v2/servers.py
@@ -526,13 +526,6 @@ class ServerManager(base.BootingManagerWithFind):
             body['server']['block_device_mapping'] = \
                 self._parse_block_device_mapping(block_device_mapping)
         elif block_device_mapping_v2:
-            # Append the image to the list only if we have new style BDMs
-            if image:
-                bdm_dict = {'uuid': image.id, 'source_type': 'image',
-                            'destination_type': 'local', 'boot_index': 0,
-                            'delete_on_termination': True}
-                block_device_mapping_v2.insert(0, bdm_dict)
-
             body['server']['block_device_mapping_v2'] = block_device_mapping_v2
 
         if nics is not None: