diff --git a/cinder/objects/volume.py b/cinder/objects/volume.py
index 4314aba688e..a528182f261 100644
--- a/cinder/objects/volume.py
+++ b/cinder/objects/volume.py
@@ -597,7 +597,7 @@ class VolumeList(base.ObjectListBase, base.CinderObject):
 
     @classmethod
     def _get_expected_attrs(cls, context, *args, **kwargs):
-        expected_attrs = ['metadata', 'volume_type']
+        expected_attrs = ['metadata', 'volume_type', 'volume_attachment']
         if context.is_admin:
             expected_attrs.append('admin_metadata')
 
diff --git a/cinder/tests/unit/keymgr/test_migration.py b/cinder/tests/unit/keymgr/test_migration.py
index d668161e4a8..1272a0df08d 100644
--- a/cinder/tests/unit/keymgr/test_migration.py
+++ b/cinder/tests/unit/keymgr/test_migration.py
@@ -62,9 +62,8 @@ class KeyMigrationTestCase(base.BaseVolumeTestCase):
         if key_id:
             vol.encryption_key_id = key_id
             vol.save()
-        self.my_vols = objects.VolumeList.get_all_by_host(self.context,
-                                                          self.conf.host)
         vol.refresh()
+        self.my_vols.append(vol)
         return vol
 
     def create_backup(self, volume_id=fake.VOLUME_ID, key_id=FIXED_KEY_ID):