diff --git a/keystoneclient/tests/unit/v3/saml2_fixtures.py b/keystoneclient/tests/unit/v3/saml2_fixtures.py
index f428a87ac..3cf2e772a 100644
--- a/keystoneclient/tests/unit/v3/saml2_fixtures.py
+++ b/keystoneclient/tests/unit/v3/saml2_fixtures.py
@@ -145,7 +145,7 @@ PROJECTS = {
         }
     ],
     "links": {
-        "self": "http://identity:35357/v3/OS-FEDERATION/projects",
+        "self": "http://identity:35357/v3/auth/projects",
         "previous": 'null',
         "next": 'null'
     }
@@ -164,7 +164,7 @@ DOMAINS = {
         }
     ],
     "links": {
-        "self": "http://identity:35357/v3/OS-FEDERATION/domains",
+        "self": "http://identity:35357/v3/auth/domains",
         "previous": 'null',
         "next": 'null'
     }
diff --git a/keystoneclient/tests/unit/v3/test_federation.py b/keystoneclient/tests/unit/v3/test_federation.py
index 3f3b08f95..906559790 100644
--- a/keystoneclient/tests/unit/v3/test_federation.py
+++ b/keystoneclient/tests/unit/v3/test_federation.py
@@ -347,7 +347,7 @@ class FederationProjectTests(utils.ClientTestCase):
         self.collection_key = 'projects'
         self.model = projects.Project
         self.manager = self.client.federation.projects
-        self.URL = "%s%s" % (self.TEST_URL, '/OS-FEDERATION/projects')
+        self.URL = "%s%s" % (self.TEST_URL, '/auth/projects')
 
     def new_ref(self, **kwargs):
         kwargs.setdefault('id', uuid.uuid4().hex)
@@ -391,7 +391,7 @@ class K2KFederatedProjectTests(utils.TestCase):
         self.session = session.Session()
         self.collection_key = 'projects'
         self.model = projects.Project
-        self.URL = '%s%s' % (self.SP_ROOT_URL, '/OS-FEDERATION/projects')
+        self.URL = '%s%s' % (self.SP_ROOT_URL, '/auth/projects')
         self.k2kplugin = self.get_plugin()
         self._mock_k2k_flow_urls()
 
@@ -473,7 +473,7 @@ class FederationDomainTests(utils.ClientTestCase):
         self.model = domains.Domain
         self.manager = self.client.federation.domains
 
-        self.URL = "%s%s" % (self.TEST_URL, '/OS-FEDERATION/domains')
+        self.URL = "%s%s" % (self.TEST_URL, '/auth/domains')
 
     def new_ref(self, **kwargs):
         kwargs.setdefault('id', uuid.uuid4().hex)
diff --git a/keystoneclient/v3/contrib/federation/base.py b/keystoneclient/v3/contrib/federation/base.py
index 653be8fe0..99c8d5a92 100644
--- a/keystoneclient/v3/contrib/federation/base.py
+++ b/keystoneclient/v3/contrib/federation/base.py
@@ -30,7 +30,7 @@ class EntityManager(base.Manager):
         raise exceptions.MethodNotImplemented
 
     def list(self):
-        url = '/OS-FEDERATION/%s' % self.object_type
+        url = '/auth/%s' % self.object_type
         try:
             tenant_list = self._list(url, self.object_type)
         except exceptions.EndpointException: