diff --git a/tempest/common/compute.py b/tempest/common/compute.py
index 2443a67..16322df 100644
--- a/tempest/common/compute.py
+++ b/tempest/common/compute.py
@@ -230,6 +230,9 @@
             fip_client.associate_floating_ip_to_server(
                 floating_ip=validation_resources['floating_ip']['ip'],
                 server_id=servers[0]['id'])
+        waiters.wait_for_server_floating_ip(
+            clients.servers_client,
+            servers[0], validation_resources['floating_ip'])
 
     if wait_until:
         for server in servers: