diff --git a/tempest/config.py b/tempest/config.py
index 74c2b9e..2a64869 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -107,17 +107,17 @@
     @property
     def alt_username(self):
         """Username of alternate user to use for Nova API requests."""
-        return self.get("alt_username", "demo")
+        return self.get("alt_username")
 
     @property
     def alt_tenant_name(self):
         """Alternate user's Tenant name to use for Nova API requests."""
-        return self.get("alt_tenant_name", "demo")
+        return self.get("alt_tenant_name")
 
     @property
     def alt_password(self):
         """API key to use when authenticating as alternate user."""
-        return self.get("alt_password", "pass")
+        return self.get("alt_password")
 
     @property
     def image_ref(self):
diff --git a/tempest/tests/test_authorization.py b/tempest/tests/test_authorization.py
index fa7a003..ae7fd3f 100644
--- a/tempest/tests/test_authorization.py
+++ b/tempest/tests/test_authorization.py
@@ -38,13 +38,13 @@
             # Setup a client instance for the second user
             cls.multi_user = True
 
-            auth_url = self.config.identity.auth_url
+            auth_url = cls.config.identity.auth_url
 
-            if self.config.identity.strategy == 'keystone':
-                client_args = (self.config, cls.user2, cls.user_2password,
+            if cls.config.identity.strategy == 'keystone':
+                client_args = (cls.config, cls.user2, cls.user2_password,
                                auth_url, cls.user2_tenant_name)
             else:
-                client_args = (self.config, cls.user2, cls.user2_password,
+                client_args = (cls.config, cls.user2, cls.user2_password,
                                auth_url)
 
             cls.other_client = ServersClient(*client_args)