diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py
index 04a21a0ca..931925f9d 100644
--- a/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py
+++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py
@@ -44,6 +44,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
         cls.keystone = cls.os.identity_client
         cls.tenants_client = cls.os.tenants_client
         cls.roles_client = cls.os.roles_client
+        cls.users_client = cls.os.users_client
         cls.datasource_id = manager_congress.get_datasource_id(
             cls.admin_manager.congress_client, 'keystone')
 
@@ -58,7 +59,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
         def _check_data_table_keystone_users():
             # Fetch data from keystone each time, because this test may start
             # before keystone has all the users.
-            users = self.keystone.list_users()['users']
+            users = self.users_client.list_users()['users']
             user_map = {}
             for user in users:
                 user_map[user['id']] = user
diff --git a/setup.cfg b/setup.cfg
index 6f44bbf4f..c240dedff 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = congress
-version = 2.0.1
+version = 3.0.0
 summary = Congress: The open policy framework for the cloud.
 description-file =
     README.rst