diff --git a/ironic/common/cinder.py b/ironic/common/cinder.py
index fcb1d71a91..bc20b1e33b 100644
--- a/ironic/common/cinder.py
+++ b/ironic/common/cinder.py
@@ -252,7 +252,7 @@ def attach_volumes(task, volume_list, connector):
             # NOTE(jtaryma): Actual connection info of already connected
             # volume will be provided by nova. Adding this dictionary to
             # 'connected' list so it contains also already connected volumes.
-            connection = {'data': {'ironic_volume_uuid': volume.uuid,
+            connection = {'data': {'ironic_volume_uuid': volume.id,
                                    'volume_id': volume_id},
                           'already_attached': True}
             connected.append(connection)
@@ -280,7 +280,7 @@ def attach_volumes(task, volume_list, connector):
 
         if 'volume_id' not in connection['data']:
             connection['data']['volume_id'] = volume_id
-        connection['data']['ironic_volume_uuid'] = volume.uuid
+        connection['data']['ironic_volume_uuid'] = volume.id
         connected.append(connection)
 
         LOG.info('Successfully initialized volume %(vol_id)s for '
diff --git a/ironic/tests/unit/common/test_cinder.py b/ironic/tests/unit/common/test_cinder.py
index e5a1167b36..d20bbd5fc4 100644
--- a/ironic/tests/unit/common/test_cinder.py
+++ b/ironic/tests/unit/common/test_cinder.py
@@ -209,7 +209,7 @@ class TestCinderActions(db_base.DbTestCase):
         connector = {'foo': 'bar'}
         mock_create_meta.return_value = {'bar': 'baz'}
         mock_is_attached.return_value = False
-        mock_get.return_value = mock.Mock(attachments=[], uuid='000-001')
+        mock_get.return_value = mock.Mock(attachments=[], id='000-001')
 
         mock_init.return_value = {
             'driver_volume_type': 'iscsi',
@@ -261,9 +261,9 @@ class TestCinderActions(db_base.DbTestCase):
         connector = {'foo': 'bar'}
         mock_create_meta.return_value = {'bar': 'baz'}
         mock_get.side_effect = [
-            mock.Mock(attachments=[], uuid='000-000'),
+            mock.Mock(attachments=[], id='000-000'),
             mock.Mock(attachments=[{'server_id': self.node.uuid}],
-                      uuid='000-001')
+                      id='000-001')
         ]
 
         mock_init.return_value = {
@@ -415,7 +415,7 @@ class TestCinderActions(db_base.DbTestCase):
         connector = {'foo': 'bar'}
         mock_create_meta.return_value = {'bar': 'baz'}
         mock_is_attached.return_value = False
-        mock_get.return_value = mock.Mock(attachments=[], uuid='000-003')
+        mock_get.return_value = mock.Mock(attachments=[], id='000-003')
         mock_init.return_value = {
             'driver_volume_type': 'iscsi',
             'data': {
@@ -465,7 +465,7 @@ class TestCinderActions(db_base.DbTestCase):
         connector = {'foo': 'bar'}
         mock_create_meta.return_value = {'bar': 'baz'}
         mock_is_attached.return_value = False
-        mock_get.return_value = mock.Mock(attachments=[], uuid='000-000')
+        mock_get.return_value = mock.Mock(attachments=[], id='000-000')
         mock_init.return_value = {
             'driver_volume_type': 'iscsi',
             'data': {