diff --git a/mixmatch/tests/unit/base.py b/mixmatch/tests/unit/base.py
index a84b19e..c77f726 100644
--- a/mixmatch/tests/unit/base.py
+++ b/mixmatch/tests/unit/base.py
@@ -64,6 +64,8 @@ class BaseTest(testcase.TestCase):
         config.post_config()
         extend.load_extensions()
 
+        self.load_auth_fixtures()
+
     def load_auth_fixtures(self):
         self.auth = FakeSession(token=uuid.uuid4().hex,
                                 project=uuid.uuid4().hex)
diff --git a/mixmatch/tests/unit/test_images.py b/mixmatch/tests/unit/test_images.py
index b95d61b..7775144 100644
--- a/mixmatch/tests/unit/test_images.py
+++ b/mixmatch/tests/unit/test_images.py
@@ -24,10 +24,6 @@ from mixmatch.model import insert, ResourceMapping
 class TestImages(base.BaseTest):
     def setUp(self):
         super(TestImages, self).setUp()
-        # TODO(ericjuma): load_auth_fixtures() should be done in the base
-        # class, but may conflict with the other tests which haven't been
-        # migrated to these fixtures.
-        self.load_auth_fixtures()
 
     def _construct_url(self, image_id='', sp=None):
         if not sp:
diff --git a/mixmatch/tests/unit/test_volumes.py b/mixmatch/tests/unit/test_volumes.py
index 427e879..4afd4ca 100644
--- a/mixmatch/tests/unit/test_volumes.py
+++ b/mixmatch/tests/unit/test_volumes.py
@@ -24,10 +24,6 @@ from mixmatch.tests.unit import samples
 class TestVolumesV3(base.BaseTest):
     def setUp(self):
         super(TestVolumesV3, self).setUp()
-        # TODO(knikolla): load_auth_fixtures() should be done in the base
-        # class, but may conflict with the other tests which haven't been
-        # migrated to these fixtures.
-        self.load_auth_fixtures()
 
     def _construct_url(self, auth=None, target=None, sp=None,
                        resource_type='volumes'):
@@ -89,10 +85,6 @@ class TestVolumesV3(base.BaseTest):
 class TestVolumesV2(base.BaseTest):
     def setUp(self):
         super(TestVolumesV2, self).setUp()
-        # TODO(knikolla): load_auth_fixtures() should be done in the base
-        # class, but may conflict with the other tests which haven't been
-        # migrated to these fixtures.
-        self.load_auth_fixtures()
 
     def _construct_url(self, auth=None, target=None, sp=None):
         if not sp: