diff --git a/octavia_tempest_plugin/common/constants.py b/octavia_tempest_plugin/common/constants.py
index 1d63d0d..c7bb82b 100644
--- a/octavia_tempest_plugin/common/constants.py
+++ b/octavia_tempest_plugin/common/constants.py
@@ -19,7 +19,7 @@
 BYTES_OUT = 'bytes_out'
 CREATED_AT = 'created_at'
 DESCRIPTION = 'description'
-FLAVOR = 'flavor'
+FLAVOR_ID = 'flavor_id'
 ID = 'id'
 LISTENERS = 'listeners'
 LOADBALANCER = 'loadbalancer'
@@ -40,7 +40,7 @@
 
 # API valid fields
 SHOW_LOAD_BALANCER_RESPONSE_FIELDS = (
-    ADMIN_STATE_UP, CREATED_AT, DESCRIPTION, FLAVOR, ID, LISTENERS, NAME,
+    ADMIN_STATE_UP, CREATED_AT, DESCRIPTION, FLAVOR_ID, ID, LISTENERS, NAME,
     OPERATING_STATUS, POOLS, PROJECT_ID, PROVIDER, PROVISIONING_STATUS,
     UPDATED_AT, VIP_ADDRESS, VIP_NETWORK_ID, VIP_PORT_ID, VIP_SUBNET_ID,
     VIP_QOS_POLICY_ID)
diff --git a/octavia_tempest_plugin/tests/waiters.py b/octavia_tempest_plugin/tests/waiters.py
index 7825782..44138a4 100644
--- a/octavia_tempest_plugin/tests/waiters.py
+++ b/octavia_tempest_plugin/tests/waiters.py
@@ -49,7 +49,14 @@
     LOG.info('Waiting for {name} status to update to {status}'.format(
         name=show_client.__name__, status=status))
     while True:
-        response = show_client(id)
+        if status == const.DELETED:
+            try:
+                response = show_client(id)
+            except exceptions.NotFound:
+                return
+        else:
+            response = show_client(id)
+
         if root_tag:
             object_details = response[root_tag]
         else: