diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py
index 1dce2b1406b8..988de9a03503 100644
--- a/nova/compute/resource_tracker.py
+++ b/nova/compute/resource_tracker.py
@@ -64,9 +64,8 @@ def _instance_in_resize_state(instance):
         return True
 
     if (vm in [vm_states.ACTIVE, vm_states.STOPPED]
-            and task in [task_states.RESIZE_PREP,
-            task_states.RESIZE_MIGRATING, task_states.RESIZE_MIGRATED,
-            task_states.RESIZE_FINISH, task_states.REBUILDING]):
+            and task in (
+                task_states.resizing_states + task_states.rebuild_states)):
         return True
 
     return False
diff --git a/nova/compute/task_states.py b/nova/compute/task_states.py
index b247d8696ffd..d549eb70a770 100644
--- a/nova/compute/task_states.py
+++ b/nova/compute/task_states.py
@@ -123,3 +123,10 @@ ALLOW_REBOOT = [None, REBOOTING, REBOOT_PENDING, REBOOT_STARTED, RESUMING,
 # These states indicate a reboot
 soft_reboot_states = (REBOOTING, REBOOT_PENDING, REBOOT_STARTED)
 hard_reboot_states = (REBOOTING_HARD, REBOOT_PENDING_HARD, REBOOT_STARTED_HARD)
+
+# These states indicate a resize in progress
+resizing_states = (RESIZE_PREP, RESIZE_MIGRATING, RESIZE_MIGRATED,
+                   RESIZE_FINISH)
+
+# These states indicate a rebuild
+rebuild_states = (REBUILDING, REBUILD_BLOCK_DEVICE_MAPPING, REBUILD_SPAWNING)
diff --git a/nova/tests/unit/compute/test_resource_tracker.py b/nova/tests/unit/compute/test_resource_tracker.py
index 36fa179c3025..1d31fec2e9ad 100644
--- a/nova/tests/unit/compute/test_resource_tracker.py
+++ b/nova/tests/unit/compute/test_resource_tracker.py
@@ -2747,6 +2747,27 @@ class TestUpdateUsageFromMigrations(BaseTestCase):
         self.assertFalse(upd_mock.called)
         self.assertEqual(mig1.status, "error")
 
+    @mock.patch('nova.objects.migration.Migration.save')
+    @mock.patch.object(resource_tracker.ResourceTracker,
+                       '_update_usage_from_migration')
+    def test_evacuate_and_resizing_states(self, mock_update_usage, mock_save):
+        self._setup_rt()
+        migration_context = objects.MigrationContext(migration_id=1)
+        instance = objects.Instance(
+            vm_state=vm_states.STOPPED, task_state=None,
+            migration_context=migration_context)
+        migration = objects.Migration(
+            source_compute='other-host', source_node='other-node',
+            dest_compute=_HOSTNAME, dest_node=_NODENAME,
+            instance_uuid=uuids.instance, id=1, instance=instance)
+        for state in task_states.rebuild_states + task_states.resizing_states:
+            instance.task_state = state
+            self.rt._update_usage_from_migrations(
+                mock.sentinel.ctx, [migration], _NODENAME)
+            mock_update_usage.assert_called_once_with(
+                mock.sentinel.ctx, instance, migration, _NODENAME)
+            mock_update_usage.reset_mock()
+
 
 class TestUpdateUsageFromInstance(BaseTestCase):