diff --git a/tempest/clients.py b/tempest/clients.py
index 1ab7cfe..336b010 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -34,6 +34,14 @@
 
     default_params = config.service_client_config()
 
+    # TODO(jordanP): remove this once no Tempest plugin use that class
+    # variable.
+    default_params_with_timeout_values = {
+        'build_interval': CONF.compute.build_interval,
+        'build_timeout': CONF.compute.build_timeout
+    }
+    default_params_with_timeout_values.update(default_params)
+
     def __init__(self, credentials, service=None, scope='project'):
         """Initialization of Manager class.