diff --git a/neutron/tests/api/contrib/clients.py b/neutron/tests/api/contrib/clients.py
index 3c1681d69ee..6ecaf7b4fb3 100644
--- a/neutron/tests/api/contrib/clients.py
+++ b/neutron/tests/api/contrib/clients.py
@@ -97,9 +97,12 @@ class Manager(manager.Manager):
         self.region_client = RegionClientJSON(self.auth_provider, **params)
         self.credentials_client = CredentialsClientJSON(self.auth_provider,
                                                         **params)
-        self.token_client = TokenClientJSON()
+        # Token clients do not use the catalog. They only need default_params.
+        self.token_client = TokenClientJSON(CONF.identity.uri,
+                                            **self.default_params)
         if CONF.identity_feature_enabled.api_v3:
-            self.token_v3_client = V3TokenClientJSON()
+            self.token_v3_client = V3TokenClientJSON(CONF.identity.uri_v3,
+                                                     **self.default_params)
 
 
 class AdminManager(Manager):
diff --git a/tools/copy_api_tests_from_tempest.sh b/tools/copy_api_tests_from_tempest.sh
index 85ba0d479e5..88c53f25f43 100755
--- a/tools/copy_api_tests_from_tempest.sh
+++ b/tools/copy_api_tests_from_tempest.sh
@@ -32,6 +32,8 @@ function copy_files {
         'tempest/common/utils'
         'tempest/services'
         'tempest/services/identity'
+        'tempest/services/identity/v2'
+        'tempest/services/identity/v2/json'
         'tempest/services/identity/v3'
         'tempest/services/identity/v3/json'
         'tempest/services/network'