diff --git a/nova/tests/functional/test_server_group.py b/nova/tests/functional/test_server_group.py
index c794d5e..df5a7fc 100644
--- a/nova/tests/functional/test_server_group.py
+++ b/nova/tests/functional/test_server_group.py
@@ -73,6 +73,9 @@ class ServerGroupTestBase(test.TestCase):
         self.start_service('scheduler')

         self.useFixture(cast_as_call.CastAsCall(self.stubs))
+        self.save_fixture = nova_fixtures.TriggerOnCall(
+            'nova.db.instance_update_and_get_original')
+        self.useFixture(self.save_fixture)

         self.addCleanup(nova.tests.unit.image.fake.FakeImageService_reset)

@@ -81,7 +84,7 @@ class ServerGroupTestBase(test.TestCase):
             server = self.admin_api.get_server(server['id'])
             if server['status'] == expected_status:
                 break
-            time.sleep(.1)
+            self.save_fixture.wait()

         return server