diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py
index aa2b053a99e..70118e91c67 100644
--- a/cinder/scheduler/manager.py
+++ b/cinder/scheduler/manager.py
@@ -282,7 +282,7 @@ class SchedulerManager(manager.Manager):
             reraise = not isinstance(ex, exception.NoValidHost)
             with excutils.save_and_reraise_exception(reraise=reraise):
                 _retype_volume_set_error(self, context, ex, request_spec,
-                                         volume, None, reservations)
+                                         volume, reservations)
         else:
             volume_rpcapi.VolumeAPI().retype(context, volume,
                                              new_type['id'], tgt_host,
diff --git a/cinder/tests/unit/scheduler/test_scheduler.py b/cinder/tests/unit/scheduler/test_scheduler.py
index 5e362f7ebe1..e89a67a8dfe 100644
--- a/cinder/tests/unit/scheduler/test_scheduler.py
+++ b/cinder/tests/unit/scheduler/test_scheduler.py
@@ -266,8 +266,9 @@ class SchedulerManagerTestCase(test.TestCase):
 
     @mock.patch('cinder.db.volume_update')
     @mock.patch('cinder.db.volume_attachment_get_all_by_volume_id')
+    @mock.patch('cinder.quota.QUOTAS.rollback')
     def test_retype_volume_exception_returns_volume_state(
-            self, _mock_vol_attachment_get, _mock_vol_update):
+            self, quota_rollback, _mock_vol_attachment_get, _mock_vol_update):
         # Test NoValidHost exception behavior for retype.
         # Puts the volume in original state and eats the exception.
         volume = tests_utils.create_volume(self.context,
@@ -279,8 +280,10 @@ class SchedulerManagerTestCase(test.TestCase):
                                                   '/dev/fake')
         _mock_vol_attachment_get.return_value = [volume_attach]
         topic = 'fake_topic'
+        reservations = mock.sentinel.reservations
         request_spec = {'volume_id': volume.id, 'volume_type': {'id': 3},
-                        'migration_policy': 'on-demand'}
+                        'migration_policy': 'on-demand',
+                        'quota_reservations': reservations}
         _mock_vol_update.return_value = {'status': 'in-use'}
         _mock_find_retype_host = mock.Mock(
             side_effect=exception.NoValidHost(reason=""))
@@ -295,6 +298,7 @@ class SchedulerManagerTestCase(test.TestCase):
         _mock_find_retype_host.assert_called_once_with(self.context,
                                                        request_spec, {},
                                                        'on-demand')
+        quota_rollback.assert_called_once_with(self.context, reservations)
         _mock_vol_update.assert_called_once_with(self.context, volume.id,
                                                  {'status': 'in-use'})
         self.manager.driver.find_retype_host = orig_retype