diff --git a/nova/tests/functional/test_servers.py b/nova/tests/functional/test_servers.py
index 9b641d6ddc73..b42bf6348771 100644
--- a/nova/tests/functional/test_servers.py
+++ b/nova/tests/functional/test_servers.py
@@ -1963,7 +1963,9 @@ class ServerMovingTests(ProviderUsageBaseTestCase):
             'shelveOffload': {}
         }
         self.api.post_server_action(server['id'], req)
-        self._wait_for_state_change(self.api, server, 'SHELVED_OFFLOADED')
+        self._wait_for_server_parameter(
+            self.api, server, {'status': 'SHELVED_OFFLOADED',
+                               'OS-EXT-SRV-ATTR:host': None})
         source_usages = self._get_provider_usages(source_rp_uuid)
         self.assertEqual({'VCPU': 0,
                           'MEMORY_MB': 0,
@@ -2656,7 +2658,9 @@ class ServerUnshelveSpawnFailTests(ProviderUsageBaseTestCase):
         # shelve offload the server
         self.flags(shelved_offload_time=0)
         self.api.post_server_action(server['id'], {'shelve': None})
-        self._wait_for_state_change(self.api, server, 'SHELVED_OFFLOADED')
+        self._wait_for_server_parameter(
+            self.api, server, {'status': 'SHELVED_OFFLOADED',
+                               'OS-EXT-SRV-ATTR:host': None})
 
         # assert allocations were removed from the host
         usages = self._get_provider_usages(rp_uuid)