diff --git a/threescale_api/client.py b/threescale_api/client.py
index 29f8034..f9435f1 100644
--- a/threescale_api/client.py
+++ b/threescale_api/client.py
@@ -58,7 +58,8 @@ def __init__(self, url: str, token: str,
             # here to mitigate the problem. This requires proper fix in checks
             time.sleep(wait)
 
-    @backoff.on_predicate(backoff.fibo, lambda ready: not ready, max_tries=8, jitter=None)
+    @backoff.on_predicate(
+            backoff.constant, lambda ready: not ready, interval=6, max_tries=90, jitter=None)
     def wait_for_tenant(self) -> bool:
         """
         When True is returned, there is some chance the tenant is actually ready.