diff --git a/tempest/openstack.py b/tempest/openstack.py
index 15cfaf9..271b5db 100644
--- a/tempest/openstack.py
+++ b/tempest/openstack.py
@@ -16,7 +16,7 @@
             os.path.dirname(__file__))),
         "etc")
 
-    DEFAULT_CONFIG_FILE = "storm.conf"
+    DEFAULT_CONFIG_FILE = "tempest.conf"
 
     def __init__(self):
         """
@@ -27,7 +27,7 @@
             self.DEFAULT_CONFIG_DIR)
         config_file = os.environ.get('TEMPEST_CONFIG',
             self.DEFAULT_CONFIG_FILE)
-        self.config = storm.config.StormConfig(config_dir, config_file)
+        self.config = tempest.config.TempestConfig(config_dir, config_file)
         self.auth_url = data_utils.build_url(self.config.nova.host,
                                         self.config.nova.port,
                                         self.config.nova.apiVer,
diff --git a/tempest/services/nova/json/limits_client.py b/tempest/services/nova/json/limits_client.py
index 883bdf2..8dd3406 100644
--- a/tempest/services/nova/json/limits_client.py
+++ b/tempest/services/nova/json/limits_client.py
@@ -4,7 +4,7 @@
 
 class LimitsClient(object):
 
-    def __init__(self, username, key, auth_url, tenant_name=None):
+    def __init__(self, config, username, key, auth_url, tenant_name=None):
         self.client = rest_client.RestClient(config, username, key,
                                              auth_url, tenant_name)