diff --git a/keystoneclient/tests/functional/v3/client_fixtures.py b/keystoneclient/tests/functional/v3/client_fixtures.py
index 56ecaf632..946764316 100644
--- a/keystoneclient/tests/functional/v3/client_fixtures.py
+++ b/keystoneclient/tests/functional/v3/client_fixtures.py
@@ -19,12 +19,11 @@ RESOURCE_NAME_PREFIX = 'keystoneclient-functional-'
 
 class Base(fixtures.Fixture):
 
-    def __init__(self, client, domain_id):
+    def __init__(self, client, domain_id=None):
         super(Base, self).__init__()
 
         self.client = client
         self.domain_id = domain_id
-
         self.ref = None
         self.entity = None
 
diff --git a/keystoneclient/tests/functional/v3/test_domains.py b/keystoneclient/tests/functional/v3/test_domains.py
index cd87f3f3c..cdfbdd742 100644
--- a/keystoneclient/tests/functional/v3/test_domains.py
+++ b/keystoneclient/tests/functional/v3/test_domains.py
@@ -54,10 +54,10 @@ class DomainsTestCase(base.V3ClientTestCase):
         self.check_domain(domain_ret)
 
     def test_list_domains(self):
-        domain_one = fixtures.Domain(self.client, self.project_domain_id)
+        domain_one = fixtures.Domain(self.client)
         self.useFixture(domain_one)
 
-        domain_two = fixtures.Domain(self.client, self.project_domain_id)
+        domain_two = fixtures.Domain(self.client)
         self.useFixture(domain_two)
 
         domains = self.client.domains.list()
@@ -70,7 +70,7 @@ class DomainsTestCase(base.V3ClientTestCase):
         self.assertIn(domain_two.entity, domains)
 
     def test_update_domain(self):
-        domain = fixtures.Domain(self.client, self.project_domain_id)
+        domain = fixtures.Domain(self.client)
         self.useFixture(domain)
 
         new_description = uuid.uuid4().hex