diff --git a/HACKING.rst b/HACKING.rst
index 6350ad49f..bccc1b455 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -7,8 +7,8 @@ http://docs.openstack.org/developer/hacking/
 Indentation
 -----------
 
-PEP-8 allows for 'visual' indentation. Do not use it. Visual indentation looks
-like this:
+PEP-8 allows for 'visual' indentation. **Do not use it**.
+Visual indentation looks like this:
 
 .. code-block:: python
 
@@ -25,9 +25,10 @@ Instead of visual indentation, use this:
       arg1, arg1, arg3, arg4)
 
 That way, if some_method ever needs to be renamed, the only line that needs
-to be touched is the line with some_method. Additionaly, if you need to
-line break at the top of a block, please indent the continuation line
-an additional 4 spaces, like this:
+to be touched is the line with some_method.
+
+Additionaly, if you need to line break at the top of a block, please indent
+the continuation line an additional 4 spaces, like this:
 
 .. code-block:: python
 
@@ -44,6 +45,9 @@ Unit Tests
 Unit tests should be virtually instant. If a unit test takes more than 1 second
 to run, it is a bad unit test. Honestly, 1 second is too slow.
 
-All unit test classes should subclass `openstack.tests.unit.base.BaseTestCase`. The
-base TestCase class takes care of properly creating `OpenStackCloud` objects
+All unit test classes should subclass `openstack.tests.unit.base.TestCase`. The
+base TestCase class takes care of properly creating `Connection` objects
 in a way that protects against local environment.
+
+Test cases should use requests-mock to mock out HTTP interactions rather than
+using mock to mock out object access.
diff --git a/openstack/tests/examples/test_compute.py b/openstack/tests/examples/test_compute.py
index 1e04b7085..127960898 100644
--- a/openstack/tests/examples/test_compute.py
+++ b/openstack/tests/examples/test_compute.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from examples.compute import create
 from examples.compute import delete
@@ -21,7 +21,7 @@ from examples.network import find as network_find
 from examples.network import list as network_list
 
 
-class TestCompute(testtools.TestCase):
+class TestCompute(base.TestCase):
     """Test the compute examples
 
     The purpose of these tests is to ensure the examples run without erring
diff --git a/openstack/tests/examples/test_identity.py b/openstack/tests/examples/test_identity.py
index 29fc95fdd..0255f1103 100644
--- a/openstack/tests/examples/test_identity.py
+++ b/openstack/tests/examples/test_identity.py
@@ -10,13 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from examples import connect
 from examples.identity import list as identity_list
 
 
-class TestIdentity(testtools.TestCase):
+class TestIdentity(base.TestCase):
     """Test the identity examples
 
     The purpose of these tests is to ensure the examples run without erring
diff --git a/openstack/tests/examples/test_image.py b/openstack/tests/examples/test_image.py
index 0c1ec1054..b1e421da8 100644
--- a/openstack/tests/examples/test_image.py
+++ b/openstack/tests/examples/test_image.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from examples import connect
 from examples.image import create as image_create
@@ -18,7 +18,7 @@ from examples.image import delete as image_delete
 from examples.image import list as image_list
 
 
-class TestImage(testtools.TestCase):
+class TestImage(base.TestCase):
     """Test the image examples
 
     The purpose of these tests is to ensure the examples run without erring
diff --git a/openstack/tests/examples/test_network.py b/openstack/tests/examples/test_network.py
index ee8646536..349d1f726 100644
--- a/openstack/tests/examples/test_network.py
+++ b/openstack/tests/examples/test_network.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from examples import connect
 from examples.network import create as network_create
@@ -19,7 +19,7 @@ from examples.network import find as network_find
 from examples.network import list as network_list
 
 
-class TestNetwork(testtools.TestCase):
+class TestNetwork(base.TestCase):
     """Test the network examples
 
     The purpose of these tests is to ensure the examples run without erring
diff --git a/openstack/tests/functional/orchestration/v1/test_stack.py b/openstack/tests/functional/orchestration/v1/test_stack.py
index aa6dc7cba..d7673a1c6 100644
--- a/openstack/tests/functional/orchestration/v1/test_stack.py
+++ b/openstack/tests/functional/orchestration/v1/test_stack.py
@@ -10,15 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import unittest
-
 from openstack import exceptions
 from openstack.orchestration.v1 import stack
 from openstack.tests.functional import base
 from openstack.tests.functional.network.v2 import test_network
 
 
-@unittest.skip("bug/1525005")
 class TestStack(base.BaseFunctionalTest):
 
     NAME = 'test_stack'
@@ -29,6 +26,9 @@ class TestStack(base.BaseFunctionalTest):
 
     def setUp(self):
         super(TestStack, self).setUp()
+        self.skipTest(
+            'Orchestration functional tests disabled:'
+            ' https://bugs.launchpad.net/python-openstacksdk/+bug/1525005')
         self.require_service('orchestration')
 
         if self.conn.compute.find_keypair(self.NAME) is None:
diff --git a/openstack/tests/unit/baremetal/test_baremetal_service.py b/openstack/tests/unit/baremetal/test_baremetal_service.py
index e808b6ef2..45ccd04e0 100644
--- a/openstack/tests/unit/baremetal/test_baremetal_service.py
+++ b/openstack/tests/unit/baremetal/test_baremetal_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.baremetal import baremetal_service
 
 
-class TestBaremetalService(testtools.TestCase):
+class TestBaremetalService(base.TestCase):
 
     def test_service(self):
         sot = baremetal_service.BaremetalService()
diff --git a/openstack/tests/unit/baremetal/test_version.py b/openstack/tests/unit/baremetal/test_version.py
index 75125e216..d6f63b6bd 100644
--- a/openstack/tests/unit/baremetal/test_version.py
+++ b/openstack/tests/unit/baremetal/test_version.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.baremetal import version
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestVersion(testtools.TestCase):
+class TestVersion(base.TestCase):
 
     def test_basic(self):
         sot = version.Version()
diff --git a/openstack/tests/unit/baremetal/v1/test_chassis.py b/openstack/tests/unit/baremetal/v1/test_chassis.py
index 3702ba596..216f0e92c 100644
--- a/openstack/tests/unit/baremetal/v1/test_chassis.py
+++ b/openstack/tests/unit/baremetal/v1/test_chassis.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.baremetal.v1 import chassis
 
@@ -43,7 +43,7 @@ FAKE = {
 }
 
 
-class TestChassis(testtools.TestCase):
+class TestChassis(base.TestCase):
 
     def test_basic(self):
         sot = chassis.Chassis()
@@ -69,7 +69,7 @@ class TestChassis(testtools.TestCase):
         self.assertEqual(FAKE['updated_at'], sot.updated_at)
 
 
-class TestChassisDetail(testtools.TestCase):
+class TestChassisDetail(base.TestCase):
 
     def test_basic(self):
         sot = chassis.ChassisDetail()
diff --git a/openstack/tests/unit/baremetal/v1/test_driver.py b/openstack/tests/unit/baremetal/v1/test_driver.py
index c360e0eba..dafd870a6 100644
--- a/openstack/tests/unit/baremetal/v1/test_driver.py
+++ b/openstack/tests/unit/baremetal/v1/test_driver.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.baremetal.v1 import driver
 
@@ -43,7 +43,7 @@ FAKE = {
 }
 
 
-class TestDriver(testtools.TestCase):
+class TestDriver(base.TestCase):
 
     def test_basic(self):
         sot = driver.Driver()
diff --git a/openstack/tests/unit/baremetal/v1/test_node.py b/openstack/tests/unit/baremetal/v1/test_node.py
index b96306111..396a9d9ad 100644
--- a/openstack/tests/unit/baremetal/v1/test_node.py
+++ b/openstack/tests/unit/baremetal/v1/test_node.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.baremetal.v1 import node
 
@@ -91,7 +91,7 @@ FAKE = {
 }
 
 
-class TestNode(testtools.TestCase):
+class TestNode(base.TestCase):
 
     def test_basic(self):
         sot = node.Node()
@@ -145,7 +145,7 @@ class TestNode(testtools.TestCase):
         self.assertEqual(FAKE['updated_at'], sot.updated_at)
 
 
-class TestNodeDetail(testtools.TestCase):
+class TestNodeDetail(base.TestCase):
 
     def test_basic(self):
         sot = node.NodeDetail()
diff --git a/openstack/tests/unit/baremetal/v1/test_port.py b/openstack/tests/unit/baremetal/v1/test_port.py
index 1ae202f63..466590146 100644
--- a/openstack/tests/unit/baremetal/v1/test_port.py
+++ b/openstack/tests/unit/baremetal/v1/test_port.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.baremetal.v1 import port
 
@@ -42,7 +42,7 @@ FAKE = {
 }
 
 
-class TestPort(testtools.TestCase):
+class TestPort(base.TestCase):
 
     def test_basic(self):
         sot = port.Port()
@@ -73,7 +73,7 @@ class TestPort(testtools.TestCase):
         self.assertEqual(FAKE['updated_at'], sot.updated_at)
 
 
-class TestPortDetail(testtools.TestCase):
+class TestPortDetail(base.TestCase):
 
     def test_basic(self):
         sot = port.PortDetail()
diff --git a/openstack/tests/unit/baremetal/v1/test_port_group.py b/openstack/tests/unit/baremetal/v1/test_port_group.py
index d8d5abdfe..0f0432ff2 100644
--- a/openstack/tests/unit/baremetal/v1/test_port_group.py
+++ b/openstack/tests/unit/baremetal/v1/test_port_group.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.baremetal.v1 import port_group
 
@@ -47,7 +47,7 @@ FAKE = {
 }
 
 
-class TestPortGroup(testtools.TestCase):
+class TestPortGroup(base.TestCase):
 
     def test_basic(self):
         sot = port_group.PortGroup()
@@ -78,7 +78,7 @@ class TestPortGroup(testtools.TestCase):
         self.assertEqual(FAKE['updated_at'], sot.updated_at)
 
 
-class TestPortGroupDetail(testtools.TestCase):
+class TestPortGroupDetail(base.TestCase):
 
     def test_basic(self):
         sot = port_group.PortGroupDetail()
diff --git a/openstack/tests/unit/base.py b/openstack/tests/unit/base.py
index d32740a67..e9836f643 100644
--- a/openstack/tests/unit/base.py
+++ b/openstack/tests/unit/base.py
@@ -18,7 +18,6 @@ import time
 import uuid
 
 import fixtures
-import mock
 import os
 import openstack.config as occ
 from requests import structures
@@ -81,12 +80,12 @@ _RoleData = collections.namedtuple(
     'role_id, role_name, json_response, json_request')
 
 
-class BaseTestCase(base.TestCase):
+class TestCase(base.TestCase):
 
     def setUp(self, cloud_config_fixture='clouds.yaml'):
         """Run before each test method to initialize test environment."""
 
-        super(BaseTestCase, self).setUp()
+        super(TestCase, self).setUp()
 
         # Sleeps are for real testing, but unit tests shouldn't need them
         realsleep = time.sleep
@@ -99,7 +98,7 @@ class BaseTestCase(base.TestCase):
                                              _nosleep))
         self.fixtures_directory = 'openstack/tests/unit/fixtures'
 
-        # Isolate os-client-config from test environment
+        # Isolate openstack.config from test environment
         config = tempfile.NamedTemporaryFile(delete=False)
         cloud_path = '%s/clouds/%s' % (self.fixtures_directory,
                                        cloud_config_fixture)
@@ -126,28 +125,6 @@ class BaseTestCase(base.TestCase):
             config=self.cloud_config,
             strict=True)
 
-
-# TODO(shade) Remove this and rename RequestsMockTestCase to TestCase.
-#             There are still a few places, like test_normalize, that assume
-#             this mocking is in place rather than having the correct
-#             requests_mock entries set up that need to be converted.
-class TestCase(BaseTestCase):
-
-    def setUp(self, cloud_config_fixture='clouds.yaml'):
-
-        super(TestCase, self).setUp(cloud_config_fixture=cloud_config_fixture)
-        self.session_fixture = self.useFixture(fixtures.MonkeyPatch(
-            'openstack.config.cloud_region.CloudRegion.get_session',
-            mock.Mock()))
-
-
-class RequestsMockTestCase(BaseTestCase):
-
-    def setUp(self, cloud_config_fixture='clouds.yaml'):
-
-        super(RequestsMockTestCase, self).setUp(
-            cloud_config_fixture=cloud_config_fixture)
-
         # FIXME(notmorgan): Convert the uri_registry, discovery.json, and
         # use of keystone_v3/v2 to a proper fixtures.Fixture. For now this
         # is acceptable, but eventually this should become it's own fixture
@@ -653,7 +630,7 @@ class RequestsMockTestCase(BaseTestCase):
                 len(self.calls), len(self.adapter.request_history))
 
 
-class IronicTestCase(RequestsMockTestCase):
+class IronicTestCase(TestCase):
 
     def setUp(self):
         super(IronicTestCase, self).setUp()
diff --git a/openstack/tests/unit/block_storage/test_block_storage_service.py b/openstack/tests/unit/block_storage/test_block_storage_service.py
index fd4ea444e..9624f3b92 100644
--- a/openstack/tests/unit/block_storage/test_block_storage_service.py
+++ b/openstack/tests/unit/block_storage/test_block_storage_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.block_storage import block_storage_service
 
 
-class TestBlockStorageService(testtools.TestCase):
+class TestBlockStorageService(base.TestCase):
 
     def test_service(self):
         sot = block_storage_service.BlockStorageService()
diff --git a/openstack/tests/unit/block_storage/v2/test_snapshot.py b/openstack/tests/unit/block_storage/v2/test_snapshot.py
index 6e542bd17..1beb99efc 100644
--- a/openstack/tests/unit/block_storage/v2/test_snapshot.py
+++ b/openstack/tests/unit/block_storage/v2/test_snapshot.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.block_storage.v2 import snapshot
 
@@ -38,7 +38,7 @@ DETAILED_SNAPSHOT = SNAPSHOT.copy()
 DETAILED_SNAPSHOT.update(**DETAILS)
 
 
-class TestSnapshot(testtools.TestCase):
+class TestSnapshot(base.TestCase):
 
     def test_basic(self):
         sot = snapshot.Snapshot(SNAPSHOT)
@@ -72,7 +72,7 @@ class TestSnapshot(testtools.TestCase):
         self.assertTrue(sot.is_forced)
 
 
-class TestSnapshotDetail(testtools.TestCase):
+class TestSnapshotDetail(base.TestCase):
 
     def test_basic(self):
         sot = snapshot.SnapshotDetail(DETAILED_SNAPSHOT)
diff --git a/openstack/tests/unit/block_storage/v2/test_type.py b/openstack/tests/unit/block_storage/v2/test_type.py
index b44c39dbe..ffb7a08bf 100644
--- a/openstack/tests/unit/block_storage/v2/test_type.py
+++ b/openstack/tests/unit/block_storage/v2/test_type.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.block_storage.v2 import type
 
@@ -24,7 +24,7 @@ TYPE = {
 }
 
 
-class TestType(testtools.TestCase):
+class TestType(base.TestCase):
 
     def test_basic(self):
         sot = type.Type(**TYPE)
diff --git a/openstack/tests/unit/block_storage/v2/test_volume.py b/openstack/tests/unit/block_storage/v2/test_volume.py
index 9c3207b8c..d08c83167 100644
--- a/openstack/tests/unit/block_storage/v2/test_volume.py
+++ b/openstack/tests/unit/block_storage/v2/test_volume.py
@@ -12,7 +12,7 @@
 
 import copy
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.block_storage.v2 import volume
 
@@ -61,7 +61,7 @@ VOLUME_DETAIL = copy.copy(VOLUME)
 VOLUME_DETAIL.update(DETAILS)
 
 
-class TestVolume(testtools.TestCase):
+class TestVolume(base.TestCase):
 
     def test_basic(self):
         sot = volume.Volume(VOLUME)
@@ -102,7 +102,7 @@ class TestVolume(testtools.TestCase):
         self.assertEqual(VOLUME["imageRef"], sot.image_id)
 
 
-class TestVolumeDetail(testtools.TestCase):
+class TestVolumeDetail(base.TestCase):
 
     def test_basic(self):
         sot = volume.VolumeDetail(VOLUME_DETAIL)
diff --git a/openstack/tests/unit/block_store/v2/test_stats.py b/openstack/tests/unit/block_store/v2/test_stats.py
index a8991a81b..0ccb7eef6 100644
--- a/openstack/tests/unit/block_store/v2/test_stats.py
+++ b/openstack/tests/unit/block_store/v2/test_stats.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.block_storage.v2 import stats
 
@@ -28,7 +28,7 @@ POOLS = {"name": "pool1",
          }
 
 
-class TestBackendPools(testtools.TestCase):
+class TestBackendPools(base.TestCase):
 
     def setUp(self):
         super(TestBackendPools, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_aggregate.py b/openstack/tests/unit/cloud/test_aggregate.py
index 5da65ef38..974aba727 100644
--- a/openstack/tests/unit/cloud/test_aggregate.py
+++ b/openstack/tests/unit/cloud/test_aggregate.py
@@ -14,7 +14,7 @@ from openstack.tests.unit import base
 from openstack.tests import fakes
 
 
-class TestAggregate(base.RequestsMockTestCase):
+class TestAggregate(base.TestCase):
 
     def setUp(self):
         super(TestAggregate, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_availability_zones.py b/openstack/tests/unit/cloud/test_availability_zones.py
index 965c41470..82c3f19e1 100644
--- a/openstack/tests/unit/cloud/test_availability_zones.py
+++ b/openstack/tests/unit/cloud/test_availability_zones.py
@@ -36,7 +36,7 @@ _fake_zone_list = {
 }
 
 
-class TestAvailabilityZoneNames(base.RequestsMockTestCase):
+class TestAvailabilityZoneNames(base.TestCase):
 
     def test_list_availability_zone_names(self):
         self.register_uris([
diff --git a/openstack/tests/unit/cloud/test_caching.py b/openstack/tests/unit/cloud/test_caching.py
index 791fdcbc7..012b16e79 100644
--- a/openstack/tests/unit/cloud/test_caching.py
+++ b/openstack/tests/unit/cloud/test_caching.py
@@ -92,7 +92,7 @@ _TASK_SCHEMA = dict(
 )
 
 
-class TestMemoryCache(base.RequestsMockTestCase):
+class TestMemoryCache(base.TestCase):
 
     def setUp(self):
         super(TestMemoryCache, self).setUp(
diff --git a/openstack/tests/unit/cloud/test_cluster_templates.py b/openstack/tests/unit/cloud/test_cluster_templates.py
index 56b45c028..32fe56f67 100644
--- a/openstack/tests/unit/cloud/test_cluster_templates.py
+++ b/openstack/tests/unit/cloud/test_cluster_templates.py
@@ -49,7 +49,7 @@ cluster_template_obj = munch.Munch(
 )
 
 
-class TestClusterTemplates(base.RequestsMockTestCase):
+class TestClusterTemplates(base.TestCase):
 
     def test_list_cluster_templates_without_detail(self):
 
diff --git a/openstack/tests/unit/cloud/test_create_server.py b/openstack/tests/unit/cloud/test_create_server.py
index 159d5912d..2de7073ed 100644
--- a/openstack/tests/unit/cloud/test_create_server.py
+++ b/openstack/tests/unit/cloud/test_create_server.py
@@ -28,7 +28,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestCreateServer(base.RequestsMockTestCase):
+class TestCreateServer(base.TestCase):
 
     def test_create_server_with_get_exception(self):
         """
diff --git a/openstack/tests/unit/cloud/test_create_volume_snapshot.py b/openstack/tests/unit/cloud/test_create_volume_snapshot.py
index 49386e3bd..1986fdb12 100644
--- a/openstack/tests/unit/cloud/test_create_volume_snapshot.py
+++ b/openstack/tests/unit/cloud/test_create_volume_snapshot.py
@@ -23,7 +23,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestCreateVolumeSnapshot(base.RequestsMockTestCase):
+class TestCreateVolumeSnapshot(base.TestCase):
 
     def test_create_volume_snapshot_wait(self):
         """
diff --git a/openstack/tests/unit/cloud/test_delete_server.py b/openstack/tests/unit/cloud/test_delete_server.py
index 304818ae1..5ae11070e 100644
--- a/openstack/tests/unit/cloud/test_delete_server.py
+++ b/openstack/tests/unit/cloud/test_delete_server.py
@@ -23,7 +23,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestDeleteServer(base.RequestsMockTestCase):
+class TestDeleteServer(base.TestCase):
 
     def test_delete_server(self):
         """
diff --git a/openstack/tests/unit/cloud/test_delete_volume_snapshot.py b/openstack/tests/unit/cloud/test_delete_volume_snapshot.py
index 92783f205..f3504d6f9 100644
--- a/openstack/tests/unit/cloud/test_delete_volume_snapshot.py
+++ b/openstack/tests/unit/cloud/test_delete_volume_snapshot.py
@@ -23,7 +23,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestDeleteVolumeSnapshot(base.RequestsMockTestCase):
+class TestDeleteVolumeSnapshot(base.TestCase):
 
     def test_delete_volume_snapshot(self):
         """
diff --git a/openstack/tests/unit/cloud/test_domains.py b/openstack/tests/unit/cloud/test_domains.py
index dcbf69e3e..9ad408a7e 100644
--- a/openstack/tests/unit/cloud/test_domains.py
+++ b/openstack/tests/unit/cloud/test_domains.py
@@ -22,7 +22,7 @@ import openstack.cloud
 from openstack.tests.unit import base
 
 
-class TestDomains(base.RequestsMockTestCase):
+class TestDomains(base.TestCase):
 
     def get_mock_url(self, service_type='identity',
                      interface='admin', resource='domains',
diff --git a/openstack/tests/unit/cloud/test_endpoints.py b/openstack/tests/unit/cloud/test_endpoints.py
index 58d9fe709..74d3c5cb7 100644
--- a/openstack/tests/unit/cloud/test_endpoints.py
+++ b/openstack/tests/unit/cloud/test_endpoints.py
@@ -27,7 +27,7 @@ from openstack.tests.unit import base
 from testtools import matchers
 
 
-class TestCloudEndpoints(base.RequestsMockTestCase):
+class TestCloudEndpoints(base.TestCase):
 
     def get_mock_url(self, service_type='identity', interface='admin',
                      resource='endpoints', append=None, base_url_append='v3'):
diff --git a/openstack/tests/unit/cloud/test_flavors.py b/openstack/tests/unit/cloud/test_flavors.py
index 0fa5ae877..72a76bb33 100644
--- a/openstack/tests/unit/cloud/test_flavors.py
+++ b/openstack/tests/unit/cloud/test_flavors.py
@@ -16,7 +16,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestFlavors(base.RequestsMockTestCase):
+class TestFlavors(base.TestCase):
 
     def test_create_flavor(self):
 
diff --git a/openstack/tests/unit/cloud/test_floating_ip_neutron.py b/openstack/tests/unit/cloud/test_floating_ip_neutron.py
index 08fb752cd..892ce3ae1 100644
--- a/openstack/tests/unit/cloud/test_floating_ip_neutron.py
+++ b/openstack/tests/unit/cloud/test_floating_ip_neutron.py
@@ -28,7 +28,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestFloatingIP(base.RequestsMockTestCase):
+class TestFloatingIP(base.TestCase):
     mock_floating_ip_list_rep = {
         'floatingips': [
             {
diff --git a/openstack/tests/unit/cloud/test_floating_ip_nova.py b/openstack/tests/unit/cloud/test_floating_ip_nova.py
index dc6261851..1ca9a68a3 100644
--- a/openstack/tests/unit/cloud/test_floating_ip_nova.py
+++ b/openstack/tests/unit/cloud/test_floating_ip_nova.py
@@ -31,7 +31,7 @@ def get_fake_has_service(has_service):
     return fake_has_service
 
 
-class TestFloatingIP(base.RequestsMockTestCase):
+class TestFloatingIP(base.TestCase):
     mock_floating_ip_list_rep = [
         {
             'fixed_ip': None,
diff --git a/openstack/tests/unit/cloud/test_floating_ip_pool.py b/openstack/tests/unit/cloud/test_floating_ip_pool.py
index 37a27f812..42e23ed4d 100644
--- a/openstack/tests/unit/cloud/test_floating_ip_pool.py
+++ b/openstack/tests/unit/cloud/test_floating_ip_pool.py
@@ -24,7 +24,7 @@ from openstack.tests.unit import base
 from openstack.tests import fakes
 
 
-class TestFloatingIPPool(base.RequestsMockTestCase):
+class TestFloatingIPPool(base.TestCase):
     pools = [{'name': u'public'}]
 
     def test_list_floating_ip_pools(self):
diff --git a/openstack/tests/unit/cloud/test_groups.py b/openstack/tests/unit/cloud/test_groups.py
index c498336b1..a5f6c336e 100644
--- a/openstack/tests/unit/cloud/test_groups.py
+++ b/openstack/tests/unit/cloud/test_groups.py
@@ -14,7 +14,7 @@
 from openstack.tests.unit import base
 
 
-class TestGroups(base.RequestsMockTestCase):
+class TestGroups(base.TestCase):
     def setUp(self, cloud_config_fixture='clouds.yaml'):
         super(TestGroups, self).setUp(
             cloud_config_fixture=cloud_config_fixture)
diff --git a/openstack/tests/unit/cloud/test_identity_roles.py b/openstack/tests/unit/cloud/test_identity_roles.py
index 211a3488a..3409e7b63 100644
--- a/openstack/tests/unit/cloud/test_identity_roles.py
+++ b/openstack/tests/unit/cloud/test_identity_roles.py
@@ -34,7 +34,7 @@ RAW_ROLE_ASSIGNMENTS = [
 ]
 
 
-class TestIdentityRoles(base.RequestsMockTestCase):
+class TestIdentityRoles(base.TestCase):
 
     def get_mock_url(self, service_type='identity', interface='admin',
                      resource='roles', append=None, base_url_append='v3',
diff --git a/openstack/tests/unit/cloud/test_image.py b/openstack/tests/unit/cloud/test_image.py
index 11a95deb1..27868b01d 100644
--- a/openstack/tests/unit/cloud/test_image.py
+++ b/openstack/tests/unit/cloud/test_image.py
@@ -34,7 +34,7 @@ from openstack.tests.unit import base
 CINDER_URL = 'https://volume.example.com/v2/1c36b64c840a42cd9e9b931a369337f0'
 
 
-class BaseTestImage(base.RequestsMockTestCase):
+class BaseTestImage(base.TestCase):
 
     def setUp(self):
         super(BaseTestImage, self).setUp()
@@ -929,7 +929,7 @@ class TestImageSuburl(BaseTestImage):
         self.assert_calls()
 
 
-class TestImageV1Only(base.RequestsMockTestCase):
+class TestImageV1Only(base.TestCase):
 
     def setUp(self):
         super(TestImageV1Only, self).setUp()
@@ -955,7 +955,7 @@ class TestImageV1Only(base.RequestsMockTestCase):
         self.assertFalse(self.cloud._is_client_version('image', 2))
 
 
-class TestImageV2Only(base.RequestsMockTestCase):
+class TestImageV2Only(base.TestCase):
 
     def setUp(self):
         super(TestImageV2Only, self).setUp()
@@ -1049,7 +1049,7 @@ class TestImageVolume(BaseTestImage):
         self.assert_calls()
 
 
-class TestImageBrokenDiscovery(base.RequestsMockTestCase):
+class TestImageBrokenDiscovery(base.TestCase):
 
     def setUp(self):
         super(TestImageBrokenDiscovery, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_image_snapshot.py b/openstack/tests/unit/cloud/test_image_snapshot.py
index 3e5f83fdc..f6d4e261e 100644
--- a/openstack/tests/unit/cloud/test_image_snapshot.py
+++ b/openstack/tests/unit/cloud/test_image_snapshot.py
@@ -19,7 +19,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestImageSnapshot(base.RequestsMockTestCase):
+class TestImageSnapshot(base.TestCase):
 
     def setUp(self):
         super(TestImageSnapshot, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_keypair.py b/openstack/tests/unit/cloud/test_keypair.py
index 2884e78c8..f7dd72e4d 100644
--- a/openstack/tests/unit/cloud/test_keypair.py
+++ b/openstack/tests/unit/cloud/test_keypair.py
@@ -17,7 +17,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestKeypair(base.RequestsMockTestCase):
+class TestKeypair(base.TestCase):
 
     def setUp(self):
         super(TestKeypair, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_limits.py b/openstack/tests/unit/cloud/test_limits.py
index 537c8877a..f731a1ae7 100644
--- a/openstack/tests/unit/cloud/test_limits.py
+++ b/openstack/tests/unit/cloud/test_limits.py
@@ -13,7 +13,7 @@
 from openstack.tests.unit import base
 
 
-class TestLimits(base.RequestsMockTestCase):
+class TestLimits(base.TestCase):
 
     def test_get_compute_limits(self):
         self.register_uris([
diff --git a/openstack/tests/unit/cloud/test_magnum_services.py b/openstack/tests/unit/cloud/test_magnum_services.py
index c30f56ccd..a410201a8 100644
--- a/openstack/tests/unit/cloud/test_magnum_services.py
+++ b/openstack/tests/unit/cloud/test_magnum_services.py
@@ -26,7 +26,7 @@ magnum_service_obj = dict(
 )
 
 
-class TestMagnumServices(base.RequestsMockTestCase):
+class TestMagnumServices(base.TestCase):
 
     def test_list_magnum_services(self):
         self.register_uris([dict(
diff --git a/openstack/tests/unit/cloud/test_meta.py b/openstack/tests/unit/cloud/test_meta.py
index 5610d739e..5bb38f0a3 100644
--- a/openstack/tests/unit/cloud/test_meta.py
+++ b/openstack/tests/unit/cloud/test_meta.py
@@ -228,7 +228,7 @@ OSIC_SUBNETS = [
 ]
 
 
-class TestMeta(base.RequestsMockTestCase):
+class TestMeta(base.TestCase):
     def test_find_nova_addresses_key_name(self):
         # Note 198.51.100.0/24 is TEST-NET-2 from rfc5737
         addrs = {'public': [{'addr': '198.51.100.1', 'version': 4}],
diff --git a/openstack/tests/unit/cloud/test_network.py b/openstack/tests/unit/cloud/test_network.py
index 825ab235a..55bb950a6 100644
--- a/openstack/tests/unit/cloud/test_network.py
+++ b/openstack/tests/unit/cloud/test_network.py
@@ -18,7 +18,7 @@ import openstack.cloud
 from openstack.tests.unit import base
 
 
-class TestNetwork(base.RequestsMockTestCase):
+class TestNetwork(base.TestCase):
 
     mock_new_network_rep = {
         'provider:physical_network': None,
diff --git a/openstack/tests/unit/cloud/test_normalize.py b/openstack/tests/unit/cloud/test_normalize.py
index 653927477..7265930b0 100644
--- a/openstack/tests/unit/cloud/test_normalize.py
+++ b/openstack/tests/unit/cloud/test_normalize.py
@@ -11,6 +11,7 @@
 # under the License.
 
 import mock
+import fixtures
 
 from openstack.tests.unit import base
 
@@ -178,9 +179,16 @@ RAW_FLAVOR_DICT = {
     'vcpus': 8}
 
 
-# TODO(shade) Convert this to RequestsMockTestCase
+# TODO(shade) Convert this to TestCase
 class TestUtils(base.TestCase):
 
+    def setUp(self):
+
+        super(TestUtils, self).setUp()
+        self.session_fixture = self.useFixture(fixtures.MonkeyPatch(
+            'openstack.config.cloud_region.CloudRegion.get_session',
+            mock.Mock()))
+
     def test_normalize_flavors(self):
         raw_flavor = RAW_FLAVOR_DICT.copy()
         expected = {
diff --git a/openstack/tests/unit/cloud/test_object.py b/openstack/tests/unit/cloud/test_object.py
index bbb879ff4..7bb8506f9 100644
--- a/openstack/tests/unit/cloud/test_object.py
+++ b/openstack/tests/unit/cloud/test_object.py
@@ -22,7 +22,7 @@ from openstack.cloud import exc
 from openstack.tests.unit import base
 
 
-class BaseTestObject(base.RequestsMockTestCase):
+class BaseTestObject(base.TestCase):
 
     def setUp(self):
         super(BaseTestObject, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_operator.py b/openstack/tests/unit/cloud/test_operator.py
index c1c3ed863..1dd3a07d3 100644
--- a/openstack/tests/unit/cloud/test_operator.py
+++ b/openstack/tests/unit/cloud/test_operator.py
@@ -19,7 +19,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestOperatorCloud(base.RequestsMockTestCase):
+class TestOperatorCloud(base.TestCase):
 
     @mock.patch.object(cloud_region.CloudRegion, 'get_endpoint')
     def test_get_session_endpoint_provided(self, fake_get_endpoint):
diff --git a/openstack/tests/unit/cloud/test_operator_noauth.py b/openstack/tests/unit/cloud/test_operator_noauth.py
index ab60dab90..4462bbf71 100644
--- a/openstack/tests/unit/cloud/test_operator_noauth.py
+++ b/openstack/tests/unit/cloud/test_operator_noauth.py
@@ -16,7 +16,7 @@ import openstack.cloud
 from openstack.tests.unit import base
 
 
-class TestOpenStackCloudOperatorNoAuth(base.RequestsMockTestCase):
+class TestOpenStackCloudOperatorNoAuth(base.TestCase):
     def setUp(self):
         """Setup Noauth OpenStackCloud tests
 
@@ -25,7 +25,7 @@ class TestOpenStackCloudOperatorNoAuth(base.RequestsMockTestCase):
         mechanism that enables Ironic noauth mode to be utilized with
         Shade.
 
-        Uses base.RequestsMockTestCase instead of IronicTestCase because
+        Uses base.TestCase instead of IronicTestCase because
         we need to do completely different things with discovery.
         """
         super(TestOpenStackCloudOperatorNoAuth, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_port.py b/openstack/tests/unit/cloud/test_port.py
index 6cc953240..962b516c8 100644
--- a/openstack/tests/unit/cloud/test_port.py
+++ b/openstack/tests/unit/cloud/test_port.py
@@ -23,7 +23,7 @@ from openstack.cloud.exc import OpenStackCloudException
 from openstack.tests.unit import base
 
 
-class TestPort(base.RequestsMockTestCase):
+class TestPort(base.TestCase):
     mock_neutron_port_create_rep = {
         'port': {
             'status': 'DOWN',
diff --git a/openstack/tests/unit/cloud/test_project.py b/openstack/tests/unit/cloud/test_project.py
index a94b42322..4bb337af0 100644
--- a/openstack/tests/unit/cloud/test_project.py
+++ b/openstack/tests/unit/cloud/test_project.py
@@ -18,7 +18,7 @@ import openstack.cloud._utils
 from openstack.tests.unit import base
 
 
-class TestProject(base.RequestsMockTestCase):
+class TestProject(base.TestCase):
 
     def get_mock_url(self, service_type='identity', interface='admin',
                      resource=None, append=None, base_url_append=None,
diff --git a/openstack/tests/unit/cloud/test_qos_bandwidth_limit_rule.py b/openstack/tests/unit/cloud/test_qos_bandwidth_limit_rule.py
index 1e5955a39..3ea365bb7 100644
--- a/openstack/tests/unit/cloud/test_qos_bandwidth_limit_rule.py
+++ b/openstack/tests/unit/cloud/test_qos_bandwidth_limit_rule.py
@@ -19,7 +19,7 @@ from openstack.cloud import exc
 from openstack.tests.unit import base
 
 
-class TestQosBandwidthLimitRule(base.RequestsMockTestCase):
+class TestQosBandwidthLimitRule(base.TestCase):
 
     policy_name = 'qos test policy'
     policy_id = '881d1bb7-a663-44c0-8f9f-ee2765b74486'
diff --git a/openstack/tests/unit/cloud/test_qos_dscp_marking_rule.py b/openstack/tests/unit/cloud/test_qos_dscp_marking_rule.py
index b8a2158a1..6ca1783f9 100644
--- a/openstack/tests/unit/cloud/test_qos_dscp_marking_rule.py
+++ b/openstack/tests/unit/cloud/test_qos_dscp_marking_rule.py
@@ -19,7 +19,7 @@ from openstack.cloud import exc
 from openstack.tests.unit import base
 
 
-class TestQosDscpMarkingRule(base.RequestsMockTestCase):
+class TestQosDscpMarkingRule(base.TestCase):
 
     policy_name = 'qos test policy'
     policy_id = '881d1bb7-a663-44c0-8f9f-ee2765b74486'
diff --git a/openstack/tests/unit/cloud/test_qos_minimum_bandwidth_rule.py b/openstack/tests/unit/cloud/test_qos_minimum_bandwidth_rule.py
index 71de9e922..4e6f54847 100644
--- a/openstack/tests/unit/cloud/test_qos_minimum_bandwidth_rule.py
+++ b/openstack/tests/unit/cloud/test_qos_minimum_bandwidth_rule.py
@@ -19,7 +19,7 @@ from openstack.cloud import exc
 from openstack.tests.unit import base
 
 
-class TestQosMinimumBandwidthRule(base.RequestsMockTestCase):
+class TestQosMinimumBandwidthRule(base.TestCase):
 
     policy_name = 'qos test policy'
     policy_id = '881d1bb7-a663-44c0-8f9f-ee2765b74486'
diff --git a/openstack/tests/unit/cloud/test_qos_policy.py b/openstack/tests/unit/cloud/test_qos_policy.py
index 38dbd27fa..89c454788 100644
--- a/openstack/tests/unit/cloud/test_qos_policy.py
+++ b/openstack/tests/unit/cloud/test_qos_policy.py
@@ -19,7 +19,7 @@ from openstack.cloud import exc
 from openstack.tests.unit import base
 
 
-class TestQosPolicy(base.RequestsMockTestCase):
+class TestQosPolicy(base.TestCase):
 
     policy_name = 'qos test policy'
     policy_id = '881d1bb7-a663-44c0-8f9f-ee2765b74486'
diff --git a/openstack/tests/unit/cloud/test_qos_rule_type.py b/openstack/tests/unit/cloud/test_qos_rule_type.py
index d52c6a1ec..1c4ab3589 100644
--- a/openstack/tests/unit/cloud/test_qos_rule_type.py
+++ b/openstack/tests/unit/cloud/test_qos_rule_type.py
@@ -17,7 +17,7 @@ from openstack.cloud import exc
 from openstack.tests.unit import base
 
 
-class TestQosRuleType(base.RequestsMockTestCase):
+class TestQosRuleType(base.TestCase):
 
     rule_type_name = "bandwidth_limit"
 
diff --git a/openstack/tests/unit/cloud/test_quotas.py b/openstack/tests/unit/cloud/test_quotas.py
index 91870b523..ade487987 100644
--- a/openstack/tests/unit/cloud/test_quotas.py
+++ b/openstack/tests/unit/cloud/test_quotas.py
@@ -31,7 +31,7 @@ fake_quota_set = {
 }
 
 
-class TestQuotas(base.RequestsMockTestCase):
+class TestQuotas(base.TestCase):
     def setUp(self, cloud_config_fixture='clouds.yaml'):
         super(TestQuotas, self).setUp(
             cloud_config_fixture=cloud_config_fixture)
diff --git a/openstack/tests/unit/cloud/test_rebuild_server.py b/openstack/tests/unit/cloud/test_rebuild_server.py
index 764639467..a72723be9 100644
--- a/openstack/tests/unit/cloud/test_rebuild_server.py
+++ b/openstack/tests/unit/cloud/test_rebuild_server.py
@@ -26,7 +26,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestRebuildServer(base.RequestsMockTestCase):
+class TestRebuildServer(base.TestCase):
 
     def setUp(self):
         super(TestRebuildServer, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_recordset.py b/openstack/tests/unit/cloud/test_recordset.py
index 26b27d47d..c8f911032 100644
--- a/openstack/tests/unit/cloud/test_recordset.py
+++ b/openstack/tests/unit/cloud/test_recordset.py
@@ -41,7 +41,7 @@ new_recordset['id'] = '1'
 new_recordset['zone'] = recordset_zone
 
 
-class TestRecordset(base.RequestsMockTestCase):
+class TestRecordset(base.TestCase):
 
     def setUp(self):
         super(TestRecordset, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_role_assignment.py b/openstack/tests/unit/cloud/test_role_assignment.py
index c6a1b73ed..c9ad2dbb2 100644
--- a/openstack/tests/unit/cloud/test_role_assignment.py
+++ b/openstack/tests/unit/cloud/test_role_assignment.py
@@ -17,7 +17,7 @@ import testtools
 from testtools import matchers
 
 
-class TestRoleAssignment(base.RequestsMockTestCase):
+class TestRoleAssignment(base.TestCase):
 
     def _build_role_assignment_response(self, role_id, scope_type, scope_id,
                                         entity_type, entity_id):
diff --git a/openstack/tests/unit/cloud/test_router.py b/openstack/tests/unit/cloud/test_router.py
index 48747d925..680b0e422 100644
--- a/openstack/tests/unit/cloud/test_router.py
+++ b/openstack/tests/unit/cloud/test_router.py
@@ -20,7 +20,7 @@ from openstack.cloud import exc
 from openstack.tests.unit import base
 
 
-class TestRouter(base.RequestsMockTestCase):
+class TestRouter(base.TestCase):
 
     router_name = 'goofy'
     router_id = '57076620-dcfb-42ed-8ad6-79ccb4a79ed2'
diff --git a/openstack/tests/unit/cloud/test_security_groups.py b/openstack/tests/unit/cloud/test_security_groups.py
index 1960373b9..d65f5ffac 100644
--- a/openstack/tests/unit/cloud/test_security_groups.py
+++ b/openstack/tests/unit/cloud/test_security_groups.py
@@ -42,7 +42,7 @@ nova_grp_dict = fakes.make_fake_nova_security_group(
 )
 
 
-class TestSecurityGroups(base.RequestsMockTestCase):
+class TestSecurityGroups(base.TestCase):
 
     def setUp(self):
         super(TestSecurityGroups, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_server_console.py b/openstack/tests/unit/cloud/test_server_console.py
index 7b7cd2b65..6ff8476d1 100644
--- a/openstack/tests/unit/cloud/test_server_console.py
+++ b/openstack/tests/unit/cloud/test_server_console.py
@@ -17,7 +17,7 @@ from openstack.tests.unit import base
 from openstack.tests import fakes
 
 
-class TestServerConsole(base.RequestsMockTestCase):
+class TestServerConsole(base.TestCase):
 
     def setUp(self):
         super(TestServerConsole, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_server_delete_metadata.py b/openstack/tests/unit/cloud/test_server_delete_metadata.py
index d6c4cebd9..ab1d1ea52 100644
--- a/openstack/tests/unit/cloud/test_server_delete_metadata.py
+++ b/openstack/tests/unit/cloud/test_server_delete_metadata.py
@@ -24,7 +24,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestServerDeleteMetadata(base.RequestsMockTestCase):
+class TestServerDeleteMetadata(base.TestCase):
 
     def setUp(self):
         super(TestServerDeleteMetadata, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_server_group.py b/openstack/tests/unit/cloud/test_server_group.py
index 3bef1c639..88b14e2b4 100644
--- a/openstack/tests/unit/cloud/test_server_group.py
+++ b/openstack/tests/unit/cloud/test_server_group.py
@@ -17,7 +17,7 @@ from openstack.tests.unit import base
 from openstack.tests import fakes
 
 
-class TestServerGroup(base.RequestsMockTestCase):
+class TestServerGroup(base.TestCase):
 
     def setUp(self):
         super(TestServerGroup, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_server_set_metadata.py b/openstack/tests/unit/cloud/test_server_set_metadata.py
index f0e21d2a1..b777ea66d 100644
--- a/openstack/tests/unit/cloud/test_server_set_metadata.py
+++ b/openstack/tests/unit/cloud/test_server_set_metadata.py
@@ -24,7 +24,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestServerSetMetadata(base.RequestsMockTestCase):
+class TestServerSetMetadata(base.TestCase):
 
     def setUp(self):
         super(TestServerSetMetadata, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_services.py b/openstack/tests/unit/cloud/test_services.py
index 99a18f9d6..c120aaa8a 100644
--- a/openstack/tests/unit/cloud/test_services.py
+++ b/openstack/tests/unit/cloud/test_services.py
@@ -25,7 +25,7 @@ from openstack.tests.unit import base
 from testtools import matchers
 
 
-class CloudServices(base.RequestsMockTestCase):
+class CloudServices(base.TestCase):
 
     def setUp(self, cloud_config_fixture='clouds.yaml'):
         super(CloudServices, self).setUp(cloud_config_fixture)
diff --git a/openstack/tests/unit/cloud/test_shade.py b/openstack/tests/unit/cloud/test_shade.py
index 1c6932d3c..b0e2309f7 100644
--- a/openstack/tests/unit/cloud/test_shade.py
+++ b/openstack/tests/unit/cloud/test_shade.py
@@ -32,7 +32,7 @@ RANGE_DATA = [
 ]
 
 
-class TestShade(base.RequestsMockTestCase):
+class TestShade(base.TestCase):
 
     def setUp(self):
         # This set of tests are not testing neutron, they're testing
diff --git a/openstack/tests/unit/cloud/test_shade_operator.py b/openstack/tests/unit/cloud/test_shade_operator.py
index a31bb57e7..1939d2daa 100644
--- a/openstack/tests/unit/cloud/test_shade_operator.py
+++ b/openstack/tests/unit/cloud/test_shade_operator.py
@@ -16,5 +16,5 @@
 from openstack.tests.unit import base
 
 
-class TestShadeOperator(base.RequestsMockTestCase):
+class TestShadeOperator(base.TestCase):
     pass
diff --git a/openstack/tests/unit/cloud/test_stack.py b/openstack/tests/unit/cloud/test_stack.py
index 448a09857..049db96f5 100644
--- a/openstack/tests/unit/cloud/test_stack.py
+++ b/openstack/tests/unit/cloud/test_stack.py
@@ -20,7 +20,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestStack(base.RequestsMockTestCase):
+class TestStack(base.TestCase):
 
     def setUp(self):
         super(TestStack, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_subnet.py b/openstack/tests/unit/cloud/test_subnet.py
index 83551513c..e8f05657b 100644
--- a/openstack/tests/unit/cloud/test_subnet.py
+++ b/openstack/tests/unit/cloud/test_subnet.py
@@ -20,7 +20,7 @@ from openstack.cloud import exc
 from openstack.tests.unit import base
 
 
-class TestSubnet(base.RequestsMockTestCase):
+class TestSubnet(base.TestCase):
 
     network_name = 'network_name'
     subnet_name = 'subnet_name'
diff --git a/openstack/tests/unit/cloud/test_update_server.py b/openstack/tests/unit/cloud/test_update_server.py
index 674525490..252da3ce7 100644
--- a/openstack/tests/unit/cloud/test_update_server.py
+++ b/openstack/tests/unit/cloud/test_update_server.py
@@ -24,7 +24,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestUpdateServer(base.RequestsMockTestCase):
+class TestUpdateServer(base.TestCase):
 
     def setUp(self):
         super(TestUpdateServer, self).setUp()
diff --git a/openstack/tests/unit/cloud/test_usage.py b/openstack/tests/unit/cloud/test_usage.py
index 3e47602b5..0aedc4c0e 100644
--- a/openstack/tests/unit/cloud/test_usage.py
+++ b/openstack/tests/unit/cloud/test_usage.py
@@ -17,7 +17,7 @@ import uuid
 from openstack.tests.unit import base
 
 
-class TestUsage(base.RequestsMockTestCase):
+class TestUsage(base.TestCase):
 
     def test_get_usage(self):
         project = self.mock_for_keystone_projects(project_count=1,
diff --git a/openstack/tests/unit/cloud/test_users.py b/openstack/tests/unit/cloud/test_users.py
index 0c155703e..c3cd40cb5 100644
--- a/openstack/tests/unit/cloud/test_users.py
+++ b/openstack/tests/unit/cloud/test_users.py
@@ -18,7 +18,7 @@ import openstack.cloud
 from openstack.tests.unit import base
 
 
-class TestUsers(base.RequestsMockTestCase):
+class TestUsers(base.TestCase):
 
     def _get_keystone_mock_url(self, resource, append=None, v3=True):
         base_url_append = None
diff --git a/openstack/tests/unit/cloud/test_volume.py b/openstack/tests/unit/cloud/test_volume.py
index 9c1e2380e..72ce1a095 100644
--- a/openstack/tests/unit/cloud/test_volume.py
+++ b/openstack/tests/unit/cloud/test_volume.py
@@ -19,7 +19,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestVolume(base.RequestsMockTestCase):
+class TestVolume(base.TestCase):
 
     def test_attach_volume(self):
         server = dict(id='server001')
diff --git a/openstack/tests/unit/cloud/test_volume_access.py b/openstack/tests/unit/cloud/test_volume_access.py
index ffdaa2db4..02ecc4054 100644
--- a/openstack/tests/unit/cloud/test_volume_access.py
+++ b/openstack/tests/unit/cloud/test_volume_access.py
@@ -19,7 +19,7 @@ import openstack.cloud
 from openstack.tests.unit import base
 
 
-class TestVolumeAccess(base.RequestsMockTestCase):
+class TestVolumeAccess(base.TestCase):
     def test_list_volume_types(self):
         volume_type = dict(
             id='voltype01', description='volume type description',
diff --git a/openstack/tests/unit/cloud/test_volume_backups.py b/openstack/tests/unit/cloud/test_volume_backups.py
index 6b6392f15..49479d31e 100644
--- a/openstack/tests/unit/cloud/test_volume_backups.py
+++ b/openstack/tests/unit/cloud/test_volume_backups.py
@@ -13,7 +13,7 @@ from openstack.cloud import meta
 from openstack.tests.unit import base
 
 
-class TestVolumeBackups(base.RequestsMockTestCase):
+class TestVolumeBackups(base.TestCase):
     def test_search_volume_backups(self):
         name = 'Volume1'
         vol1 = {'name': name, 'availability_zone': 'az1'}
diff --git a/openstack/tests/unit/cloud/test_zone.py b/openstack/tests/unit/cloud/test_zone.py
index 958d3faaa..193cc66d9 100644
--- a/openstack/tests/unit/cloud/test_zone.py
+++ b/openstack/tests/unit/cloud/test_zone.py
@@ -29,7 +29,7 @@ new_zone_dict = copy.copy(zone_dict)
 new_zone_dict['id'] = '1'
 
 
-class TestZone(base.RequestsMockTestCase):
+class TestZone(base.TestCase):
 
     def setUp(self):
         super(TestZone, self).setUp()
diff --git a/openstack/tests/unit/clustering/test_cluster_service.py b/openstack/tests/unit/clustering/test_cluster_service.py
index 4c828bd66..f52cafdaf 100644
--- a/openstack/tests/unit/clustering/test_cluster_service.py
+++ b/openstack/tests/unit/clustering/test_cluster_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering import clustering_service
 
 
-class TestClusteringService(testtools.TestCase):
+class TestClusteringService(base.TestCase):
 
     def test_service(self):
         sot = clustering_service.ClusteringService()
diff --git a/openstack/tests/unit/clustering/test_version.py b/openstack/tests/unit/clustering/test_version.py
index 30646a5c7..60d7b0c3f 100644
--- a/openstack/tests/unit/clustering/test_version.py
+++ b/openstack/tests/unit/clustering/test_version.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering import version
 
@@ -22,7 +22,7 @@ EXAMPLE = {
 }
 
 
-class TestVersion(testtools.TestCase):
+class TestVersion(base.TestCase):
 
     def test_basic(self):
         sot = version.Version()
diff --git a/openstack/tests/unit/clustering/v1/test_action.py b/openstack/tests/unit/clustering/v1/test_action.py
index b12eaac98..a4d462b95 100644
--- a/openstack/tests/unit/clustering/v1/test_action.py
+++ b/openstack/tests/unit/clustering/v1/test_action.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import action
 
@@ -43,7 +43,7 @@ FAKE = {
 }
 
 
-class TestAction(testtools.TestCase):
+class TestAction(base.TestCase):
 
     def setUp(self):
         super(TestAction, self).setUp()
diff --git a/openstack/tests/unit/clustering/v1/test_build_info.py b/openstack/tests/unit/clustering/v1/test_build_info.py
index 080d0b15b..8d209d603 100644
--- a/openstack/tests/unit/clustering/v1/test_build_info.py
+++ b/openstack/tests/unit/clustering/v1/test_build_info.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import build_info
 
@@ -25,7 +25,7 @@ FAKE = {
 }
 
 
-class TestBuildInfo(testtools.TestCase):
+class TestBuildInfo(base.TestCase):
 
     def setUp(self):
         super(TestBuildInfo, self).setUp()
diff --git a/openstack/tests/unit/clustering/v1/test_cluster.py b/openstack/tests/unit/clustering/v1/test_cluster.py
index 4c4cf55b5..52ee8f8c4 100644
--- a/openstack/tests/unit/clustering/v1/test_cluster.py
+++ b/openstack/tests/unit/clustering/v1/test_cluster.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import cluster
 
@@ -65,7 +65,7 @@ FAKE_CREATE_RESP = {
 }
 
 
-class TestCluster(testtools.TestCase):
+class TestCluster(base.TestCase):
 
     def setUp(self):
         super(TestCluster, self).setUp()
diff --git a/openstack/tests/unit/clustering/v1/test_cluster_attr.py b/openstack/tests/unit/clustering/v1/test_cluster_attr.py
index 3d7181682..e64cdcb9e 100644
--- a/openstack/tests/unit/clustering/v1/test_cluster_attr.py
+++ b/openstack/tests/unit/clustering/v1/test_cluster_attr.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import cluster_attr as ca
 
@@ -23,7 +23,7 @@ FAKE = {
 }
 
 
-class TestClusterAttr(testtools.TestCase):
+class TestClusterAttr(base.TestCase):
 
     def setUp(self):
         super(TestClusterAttr, self).setUp()
diff --git a/openstack/tests/unit/clustering/v1/test_cluster_policy.py b/openstack/tests/unit/clustering/v1/test_cluster_policy.py
index e84990e12..5ce71ae3e 100644
--- a/openstack/tests/unit/clustering/v1/test_cluster_policy.py
+++ b/openstack/tests/unit/clustering/v1/test_cluster_policy.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import cluster_policy
 
@@ -26,7 +26,7 @@ FAKE = {
 }
 
 
-class TestClusterPolicy(testtools.TestCase):
+class TestClusterPolicy(base.TestCase):
 
     def setUp(self):
         super(TestClusterPolicy, self).setUp()
diff --git a/openstack/tests/unit/clustering/v1/test_event.py b/openstack/tests/unit/clustering/v1/test_event.py
index 82a76593a..47c80c7d2 100644
--- a/openstack/tests/unit/clustering/v1/test_event.py
+++ b/openstack/tests/unit/clustering/v1/test_event.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import event
 
@@ -31,7 +31,7 @@ FAKE = {
 }
 
 
-class TestEvent(testtools.TestCase):
+class TestEvent(base.TestCase):
 
     def setUp(self):
         super(TestEvent, self).setUp()
diff --git a/openstack/tests/unit/clustering/v1/test_node.py b/openstack/tests/unit/clustering/v1/test_node.py
index 9e6cbf7aa..65868b728 100644
--- a/openstack/tests/unit/clustering/v1/test_node.py
+++ b/openstack/tests/unit/clustering/v1/test_node.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import node
 
@@ -37,7 +37,7 @@ FAKE = {
 }
 
 
-class TestNode(testtools.TestCase):
+class TestNode(base.TestCase):
 
     def test_basic(self):
         sot = node.Node()
@@ -156,7 +156,7 @@ class TestNode(testtools.TestCase):
         sess.delete.assert_called_once_with(url, json=body)
 
 
-class TestNodeDetail(testtools.TestCase):
+class TestNodeDetail(base.TestCase):
 
     def test_basic(self):
         sot = node.NodeDetail()
diff --git a/openstack/tests/unit/clustering/v1/test_policy.py b/openstack/tests/unit/clustering/v1/test_policy.py
index a238c08cf..137e6214b 100644
--- a/openstack/tests/unit/clustering/v1/test_policy.py
+++ b/openstack/tests/unit/clustering/v1/test_policy.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import policy
 
@@ -41,7 +41,7 @@ FAKE = {
 }
 
 
-class TestPolicy(testtools.TestCase):
+class TestPolicy(base.TestCase):
 
     def setUp(self):
         super(TestPolicy, self).setUp()
@@ -71,7 +71,7 @@ class TestPolicy(testtools.TestCase):
         self.assertEqual(FAKE['updated_at'], sot.updated_at)
 
 
-class TestPolicyValidate(testtools.TestCase):
+class TestPolicyValidate(base.TestCase):
 
     def setUp(self):
         super(TestPolicyValidate, self).setUp()
diff --git a/openstack/tests/unit/clustering/v1/test_policy_type.py b/openstack/tests/unit/clustering/v1/test_policy_type.py
index 7ce8f0507..defdd6944 100644
--- a/openstack/tests/unit/clustering/v1/test_policy_type.py
+++ b/openstack/tests/unit/clustering/v1/test_policy_type.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import policy_type
 
@@ -29,7 +29,7 @@ FAKE = {
 }
 
 
-class TestPolicyType(testtools.TestCase):
+class TestPolicyType(base.TestCase):
 
     def test_basic(self):
         sot = policy_type.PolicyType()
diff --git a/openstack/tests/unit/clustering/v1/test_profile.py b/openstack/tests/unit/clustering/v1/test_profile.py
index 61de6a971..047e5c037 100644
--- a/openstack/tests/unit/clustering/v1/test_profile.py
+++ b/openstack/tests/unit/clustering/v1/test_profile.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import profile
 
@@ -41,7 +41,7 @@ FAKE = {
 }
 
 
-class TestProfile(testtools.TestCase):
+class TestProfile(base.TestCase):
 
     def setUp(self):
         super(TestProfile, self).setUp()
@@ -73,7 +73,7 @@ class TestProfile(testtools.TestCase):
         self.assertEqual(FAKE['updated_at'], sot.updated_at)
 
 
-class TestProfileValidate(testtools.TestCase):
+class TestProfileValidate(base.TestCase):
 
     def setUp(self):
         super(TestProfileValidate, self).setUp()
diff --git a/openstack/tests/unit/clustering/v1/test_profile_type.py b/openstack/tests/unit/clustering/v1/test_profile_type.py
index 88816e2c6..f3c7f91a8 100644
--- a/openstack/tests/unit/clustering/v1/test_profile_type.py
+++ b/openstack/tests/unit/clustering/v1/test_profile_type.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import profile_type
 
@@ -29,7 +29,7 @@ FAKE = {
 }
 
 
-class TestProfileType(testtools.TestCase):
+class TestProfileType(base.TestCase):
 
     def test_basic(self):
         sot = profile_type.ProfileType()
diff --git a/openstack/tests/unit/clustering/v1/test_receiver.py b/openstack/tests/unit/clustering/v1/test_receiver.py
index 39875b4ab..ad6fedf8a 100644
--- a/openstack/tests/unit/clustering/v1/test_receiver.py
+++ b/openstack/tests/unit/clustering/v1/test_receiver.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import receiver
 
@@ -40,7 +40,7 @@ FAKE = {
 }
 
 
-class TestReceiver(testtools.TestCase):
+class TestReceiver(base.TestCase):
 
     def setUp(self):
         super(TestReceiver, self).setUp()
diff --git a/openstack/tests/unit/clustering/v1/test_service.py b/openstack/tests/unit/clustering/v1/test_service.py
index cc94f42b4..a97fa678d 100644
--- a/openstack/tests/unit/clustering/v1/test_service.py
+++ b/openstack/tests/unit/clustering/v1/test_service.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.clustering.v1 import service
 
@@ -26,7 +26,7 @@ EXAMPLE = {
 }
 
 
-class TestService(testtools.TestCase):
+class TestService(base.TestCase):
 
     def setUp(self):
         super(TestService, self).setUp()
diff --git a/openstack/tests/unit/compute/test_compute_service.py b/openstack/tests/unit/compute/test_compute_service.py
index 3c5b26c8f..3a3ed7bbe 100644
--- a/openstack/tests/unit/compute/test_compute_service.py
+++ b/openstack/tests/unit/compute/test_compute_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute import compute_service
 
 
-class TestComputeService(testtools.TestCase):
+class TestComputeService(base.TestCase):
 
     def test_service(self):
         sot = compute_service.ComputeService()
diff --git a/openstack/tests/unit/compute/test_version.py b/openstack/tests/unit/compute/test_version.py
index 0940b2cf4..45bf2d69a 100644
--- a/openstack/tests/unit/compute/test_version.py
+++ b/openstack/tests/unit/compute/test_version.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute import version
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestVersion(testtools.TestCase):
+class TestVersion(base.TestCase):
 
     def test_basic(self):
         sot = version.Version()
diff --git a/openstack/tests/unit/compute/v2/test_availability_zone.py b/openstack/tests/unit/compute/v2/test_availability_zone.py
index 4d4abe099..66489eb58 100644
--- a/openstack/tests/unit/compute/v2/test_availability_zone.py
+++ b/openstack/tests/unit/compute/v2/test_availability_zone.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import availability_zone as az
 
@@ -23,7 +23,7 @@ BASIC_EXAMPLE = {
 }
 
 
-class TestAvailabilityZone(testtools.TestCase):
+class TestAvailabilityZone(base.TestCase):
 
     def test_basic(self):
         sot = az.AvailabilityZone()
diff --git a/openstack/tests/unit/compute/v2/test_extension.py b/openstack/tests/unit/compute/v2/test_extension.py
index 8d59084b2..86bfa96ec 100644
--- a/openstack/tests/unit/compute/v2/test_extension.py
+++ b/openstack/tests/unit/compute/v2/test_extension.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import extension
 
@@ -25,7 +25,7 @@ EXAMPLE = {
 }
 
 
-class TestExtension(testtools.TestCase):
+class TestExtension(base.TestCase):
 
     def test_basic(self):
         sot = extension.Extension()
diff --git a/openstack/tests/unit/compute/v2/test_flavor.py b/openstack/tests/unit/compute/v2/test_flavor.py
index dba4a4aaa..d4c154724 100644
--- a/openstack/tests/unit/compute/v2/test_flavor.py
+++ b/openstack/tests/unit/compute/v2/test_flavor.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import flavor
 
@@ -30,7 +30,7 @@ BASIC_EXAMPLE = {
 }
 
 
-class TestFlavor(testtools.TestCase):
+class TestFlavor(base.TestCase):
 
     def test_basic(self):
         sot = flavor.Flavor()
diff --git a/openstack/tests/unit/compute/v2/test_hypervisor.py b/openstack/tests/unit/compute/v2/test_hypervisor.py
index 04829c081..e6bccba67 100644
--- a/openstack/tests/unit/compute/v2/test_hypervisor.py
+++ b/openstack/tests/unit/compute/v2/test_hypervisor.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import hypervisor
 
@@ -42,7 +42,7 @@ EXAMPLE = {
 }
 
 
-class TestHypervisor(testtools.TestCase):
+class TestHypervisor(base.TestCase):
 
     def test_basic(self):
         sot = hypervisor.Hypervisor()
diff --git a/openstack/tests/unit/compute/v2/test_image.py b/openstack/tests/unit/compute/v2/test_image.py
index 8e848a238..158beba41 100644
--- a/openstack/tests/unit/compute/v2/test_image.py
+++ b/openstack/tests/unit/compute/v2/test_image.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import image
 
@@ -36,7 +36,7 @@ DETAIL_EXAMPLE = BASIC_EXAMPLE.copy()
 DETAIL_EXAMPLE.update(DETAILS)
 
 
-class TestImage(testtools.TestCase):
+class TestImage(base.TestCase):
 
     def test_basic(self):
         sot = image.Image()
diff --git a/openstack/tests/unit/compute/v2/test_keypair.py b/openstack/tests/unit/compute/v2/test_keypair.py
index 3fb3dbcbc..54efd3871 100644
--- a/openstack/tests/unit/compute/v2/test_keypair.py
+++ b/openstack/tests/unit/compute/v2/test_keypair.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import keypair
 
@@ -22,7 +22,7 @@ EXAMPLE = {
 }
 
 
-class TestKeypair(testtools.TestCase):
+class TestKeypair(base.TestCase):
 
     def test_basic(self):
         sot = keypair.Keypair()
diff --git a/openstack/tests/unit/compute/v2/test_limits.py b/openstack/tests/unit/compute/v2/test_limits.py
index a5cd5d66d..81ded5765 100644
--- a/openstack/tests/unit/compute/v2/test_limits.py
+++ b/openstack/tests/unit/compute/v2/test_limits.py
@@ -14,7 +14,7 @@ import copy
 
 from keystoneauth1 import adapter
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import limits
 
@@ -62,7 +62,7 @@ LIMITS_BODY = {
 }
 
 
-class TestAbsoluteLimits(testtools.TestCase):
+class TestAbsoluteLimits(base.TestCase):
 
     def test_basic(self):
         sot = limits.AbsoluteLimits()
@@ -112,7 +112,7 @@ class TestAbsoluteLimits(testtools.TestCase):
                          sot.total_cores_used)
 
 
-class TestRateLimit(testtools.TestCase):
+class TestRateLimit(base.TestCase):
 
     def test_basic(self):
         sot = limits.RateLimit()
@@ -133,7 +133,7 @@ class TestRateLimit(testtools.TestCase):
         self.assertEqual(RATE_LIMIT["limit"], sot.limits)
 
 
-class TestLimits(testtools.TestCase):
+class TestLimits(base.TestCase):
 
     def test_basic(self):
         sot = limits.Limits()
diff --git a/openstack/tests/unit/compute/v2/test_metadata.py b/openstack/tests/unit/compute/v2/test_metadata.py
index 8f2c4da64..6924b93e9 100644
--- a/openstack/tests/unit/compute/v2/test_metadata.py
+++ b/openstack/tests/unit/compute/v2/test_metadata.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import server
 
@@ -24,7 +24,7 @@ IDENTIFIER = 'IDENTIFIER'
 # working.
 
 
-class TestMetadata(testtools.TestCase):
+class TestMetadata(base.TestCase):
 
     def setUp(self):
         super(TestMetadata, self).setUp()
diff --git a/openstack/tests/unit/compute/v2/test_server.py b/openstack/tests/unit/compute/v2/test_server.py
index 601ec5f62..3de08fc04 100644
--- a/openstack/tests/unit/compute/v2/test_server.py
+++ b/openstack/tests/unit/compute/v2/test_server.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import server
 
@@ -57,7 +57,7 @@ EXAMPLE = {
 }
 
 
-class TestServer(testtools.TestCase):
+class TestServer(base.TestCase):
 
     def setUp(self):
         super(TestServer, self).setUp()
diff --git a/openstack/tests/unit/compute/v2/test_server_group.py b/openstack/tests/unit/compute/v2/test_server_group.py
index 3fabbfc12..224c5efca 100644
--- a/openstack/tests/unit/compute/v2/test_server_group.py
+++ b/openstack/tests/unit/compute/v2/test_server_group.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import server_group
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestServerGroup(testtools.TestCase):
+class TestServerGroup(base.TestCase):
 
     def test_basic(self):
         sot = server_group.ServerGroup()
diff --git a/openstack/tests/unit/compute/v2/test_server_interface.py b/openstack/tests/unit/compute/v2/test_server_interface.py
index 64467541a..b0374f5b1 100644
--- a/openstack/tests/unit/compute/v2/test_server_interface.py
+++ b/openstack/tests/unit/compute/v2/test_server_interface.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import server_interface
 
@@ -30,7 +30,7 @@ EXAMPLE = {
 }
 
 
-class TestServerInterface(testtools.TestCase):
+class TestServerInterface(base.TestCase):
 
     def test_basic(self):
         sot = server_interface.ServerInterface()
diff --git a/openstack/tests/unit/compute/v2/test_server_ip.py b/openstack/tests/unit/compute/v2/test_server_ip.py
index 770b67a21..ab3fce4d3 100644
--- a/openstack/tests/unit/compute/v2/test_server_ip.py
+++ b/openstack/tests/unit/compute/v2/test_server_ip.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import server_ip
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestServerIP(testtools.TestCase):
+class TestServerIP(base.TestCase):
 
     def test_basic(self):
         sot = server_ip.ServerIP()
diff --git a/openstack/tests/unit/compute/v2/test_service.py b/openstack/tests/unit/compute/v2/test_service.py
index 3a1e4ca40..4ef25c812 100644
--- a/openstack/tests/unit/compute/v2/test_service.py
+++ b/openstack/tests/unit/compute/v2/test_service.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import service
 
@@ -26,7 +26,7 @@ EXAMPLE = {
 }
 
 
-class TestService(testtools.TestCase):
+class TestService(base.TestCase):
 
     def setUp(self):
         super(TestService, self).setUp()
diff --git a/openstack/tests/unit/compute/v2/test_volume_attachment.py b/openstack/tests/unit/compute/v2/test_volume_attachment.py
index 87d4cdbd5..30d999dbd 100644
--- a/openstack/tests/unit/compute/v2/test_volume_attachment.py
+++ b/openstack/tests/unit/compute/v2/test_volume_attachment.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.compute.v2 import volume_attachment
 
@@ -21,7 +21,7 @@ EXAMPLE = {
 }
 
 
-class TestServerInterface(testtools.TestCase):
+class TestServerInterface(base.TestCase):
 
     def test_basic(self):
         sot = volume_attachment.VolumeAttachment()
diff --git a/openstack/tests/unit/config/base.py b/openstack/tests/unit/config/base.py
index cd569a4fd..5e2a72a65 100644
--- a/openstack/tests/unit/config/base.py
+++ b/openstack/tests/unit/config/base.py
@@ -15,18 +15,16 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# TODO(shade) Shift to using new combined base unit test class
 import copy
 import os
 import tempfile
 
-from openstack.config import cloud_region
-
 import extras
 import fixtures
-from oslotest import base
 import yaml
 
+from openstack.config import cloud_region
+from openstack.tests.unit import base
 
 VENDOR_CONF = {
     'public-clouds': {
@@ -199,13 +197,12 @@ def _write_yaml(obj):
         return obj_yaml.name
 
 
-class TestCase(base.BaseTestCase):
+class TestCase(base.TestCase):
     """Test case base class for all unit tests."""
 
     def setUp(self):
         super(TestCase, self).setUp()
 
-        self.useFixture(fixtures.NestedTempfile())
         conf = copy.deepcopy(USER_CONF)
         tdir = self.useFixture(fixtures.TempDir())
         conf['cache']['path'] = tdir.path
diff --git a/openstack/tests/unit/config/test_from_session.py b/openstack/tests/unit/config/test_from_session.py
index 9b2b1fe29..69f2d898c 100644
--- a/openstack/tests/unit/config/test_from_session.py
+++ b/openstack/tests/unit/config/test_from_session.py
@@ -21,7 +21,7 @@ from openstack.tests import fakes
 from openstack.tests.unit import base
 
 
-class TestFromSession(base.RequestsMockTestCase):
+class TestFromSession(base.TestCase):
 
     scenarios = [
         ('no_region', dict(test_region=None)),
diff --git a/openstack/tests/unit/database/test_database_service.py b/openstack/tests/unit/database/test_database_service.py
index 6793acd43..85c57d887 100644
--- a/openstack/tests/unit/database/test_database_service.py
+++ b/openstack/tests/unit/database/test_database_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.database import database_service
 
 
-class TestDatabaseService(testtools.TestCase):
+class TestDatabaseService(base.TestCase):
 
     def test_service(self):
         sot = database_service.DatabaseService()
diff --git a/openstack/tests/unit/database/v1/test_database.py b/openstack/tests/unit/database/v1/test_database.py
index 6f8cda2ca..d136bcbb3 100644
--- a/openstack/tests/unit/database/v1/test_database.py
+++ b/openstack/tests/unit/database/v1/test_database.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.database.v1 import database
 
@@ -25,7 +25,7 @@ EXAMPLE = {
 }
 
 
-class TestDatabase(testtools.TestCase):
+class TestDatabase(base.TestCase):
 
     def test_basic(self):
         sot = database.Database()
diff --git a/openstack/tests/unit/database/v1/test_flavor.py b/openstack/tests/unit/database/v1/test_flavor.py
index a851e45d2..bb6b1c83a 100644
--- a/openstack/tests/unit/database/v1/test_flavor.py
+++ b/openstack/tests/unit/database/v1/test_flavor.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.database.v1 import flavor
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestFlavor(testtools.TestCase):
+class TestFlavor(base.TestCase):
 
     def test_basic(self):
         sot = flavor.Flavor()
diff --git a/openstack/tests/unit/database/v1/test_instance.py b/openstack/tests/unit/database/v1/test_instance.py
index 116f63b7c..c217ff062 100644
--- a/openstack/tests/unit/database/v1/test_instance.py
+++ b/openstack/tests/unit/database/v1/test_instance.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.database.v1 import instance
 
@@ -31,7 +31,7 @@ EXAMPLE = {
 }
 
 
-class TestInstance(testtools.TestCase):
+class TestInstance(base.TestCase):
 
     def test_basic(self):
         sot = instance.Instance()
diff --git a/openstack/tests/unit/database/v1/test_user.py b/openstack/tests/unit/database/v1/test_user.py
index 884a906e9..83a91a8ef 100644
--- a/openstack/tests/unit/database/v1/test_user.py
+++ b/openstack/tests/unit/database/v1/test_user.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.database.v1 import user
 
@@ -23,7 +23,7 @@ CREATING = {
 }
 
 
-class TestUser(testtools.TestCase):
+class TestUser(base.TestCase):
 
     def test_basic(self):
         sot = user.User()
diff --git a/openstack/tests/unit/identity/test_identity_service.py b/openstack/tests/unit/identity/test_identity_service.py
index dbfaea3d6..47125928b 100644
--- a/openstack/tests/unit/identity/test_identity_service.py
+++ b/openstack/tests/unit/identity/test_identity_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity import identity_service
 
 
-class TestIdentityService(testtools.TestCase):
+class TestIdentityService(base.TestCase):
 
     def test_regular_service(self):
         sot = identity_service.IdentityService()
diff --git a/openstack/tests/unit/identity/test_version.py b/openstack/tests/unit/identity/test_version.py
index a3693f0da..a53a8b2c1 100644
--- a/openstack/tests/unit/identity/test_version.py
+++ b/openstack/tests/unit/identity/test_version.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity import version
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestVersion(testtools.TestCase):
+class TestVersion(base.TestCase):
 
     def test_basic(self):
         sot = version.Version()
diff --git a/openstack/tests/unit/identity/v2/test_extension.py b/openstack/tests/unit/identity/v2/test_extension.py
index 13d0d29b1..d7e768f71 100644
--- a/openstack/tests/unit/identity/v2/test_extension.py
+++ b/openstack/tests/unit/identity/v2/test_extension.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v2 import extension
 
@@ -26,7 +26,7 @@ EXAMPLE = {
 }
 
 
-class TestExtension(testtools.TestCase):
+class TestExtension(base.TestCase):
 
     def test_basic(self):
         sot = extension.Extension()
diff --git a/openstack/tests/unit/identity/v2/test_role.py b/openstack/tests/unit/identity/v2/test_role.py
index e1f67ba36..a1d2e060a 100644
--- a/openstack/tests/unit/identity/v2/test_role.py
+++ b/openstack/tests/unit/identity/v2/test_role.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v2 import role
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestRole(testtools.TestCase):
+class TestRole(base.TestCase):
 
     def test_basic(self):
         sot = role.Role()
diff --git a/openstack/tests/unit/identity/v2/test_tenant.py b/openstack/tests/unit/identity/v2/test_tenant.py
index b123ce40c..a0c63219e 100644
--- a/openstack/tests/unit/identity/v2/test_tenant.py
+++ b/openstack/tests/unit/identity/v2/test_tenant.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v2 import tenant
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestTenant(testtools.TestCase):
+class TestTenant(base.TestCase):
 
     def test_basic(self):
         sot = tenant.Tenant()
diff --git a/openstack/tests/unit/identity/v2/test_user.py b/openstack/tests/unit/identity/v2/test_user.py
index 161b8bade..3fae75902 100644
--- a/openstack/tests/unit/identity/v2/test_user.py
+++ b/openstack/tests/unit/identity/v2/test_user.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v2 import user
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestUser(testtools.TestCase):
+class TestUser(base.TestCase):
 
     def test_basic(self):
         sot = user.User()
diff --git a/openstack/tests/unit/identity/v3/test_credential.py b/openstack/tests/unit/identity/v3/test_credential.py
index eb4c1e216..8fc9676d3 100644
--- a/openstack/tests/unit/identity/v3/test_credential.py
+++ b/openstack/tests/unit/identity/v3/test_credential.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import credential
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestCredential(testtools.TestCase):
+class TestCredential(base.TestCase):
 
     def test_basic(self):
         sot = credential.Credential()
diff --git a/openstack/tests/unit/identity/v3/test_domain.py b/openstack/tests/unit/identity/v3/test_domain.py
index 6e6cb3d00..2d75d9e3c 100644
--- a/openstack/tests/unit/identity/v3/test_domain.py
+++ b/openstack/tests/unit/identity/v3/test_domain.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import domain
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestDomain(testtools.TestCase):
+class TestDomain(base.TestCase):
 
     def test_basic(self):
         sot = domain.Domain()
diff --git a/openstack/tests/unit/identity/v3/test_endpoint.py b/openstack/tests/unit/identity/v3/test_endpoint.py
index 115e9b7ef..53a27d4c6 100644
--- a/openstack/tests/unit/identity/v3/test_endpoint.py
+++ b/openstack/tests/unit/identity/v3/test_endpoint.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import endpoint
 
@@ -26,7 +26,7 @@ EXAMPLE = {
 }
 
 
-class TestEndpoint(testtools.TestCase):
+class TestEndpoint(base.TestCase):
 
     def test_basic(self):
         sot = endpoint.Endpoint()
diff --git a/openstack/tests/unit/identity/v3/test_group.py b/openstack/tests/unit/identity/v3/test_group.py
index 2051aeb3c..edb17f09c 100644
--- a/openstack/tests/unit/identity/v3/test_group.py
+++ b/openstack/tests/unit/identity/v3/test_group.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import group
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestGroup(testtools.TestCase):
+class TestGroup(base.TestCase):
 
     def test_basic(self):
         sot = group.Group()
diff --git a/openstack/tests/unit/identity/v3/test_policy.py b/openstack/tests/unit/identity/v3/test_policy.py
index b514da96e..0533b9382 100644
--- a/openstack/tests/unit/identity/v3/test_policy.py
+++ b/openstack/tests/unit/identity/v3/test_policy.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import policy
 
@@ -25,7 +25,7 @@ EXAMPLE = {
 }
 
 
-class TestPolicy(testtools.TestCase):
+class TestPolicy(base.TestCase):
 
     def test_basic(self):
         sot = policy.Policy()
diff --git a/openstack/tests/unit/identity/v3/test_project.py b/openstack/tests/unit/identity/v3/test_project.py
index 2c38efceb..246adaf43 100644
--- a/openstack/tests/unit/identity/v3/test_project.py
+++ b/openstack/tests/unit/identity/v3/test_project.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import project
 
@@ -26,7 +26,7 @@ EXAMPLE = {
 }
 
 
-class TestProject(testtools.TestCase):
+class TestProject(base.TestCase):
 
     def test_basic(self):
         sot = project.Project()
@@ -64,7 +64,7 @@ class TestProject(testtools.TestCase):
         self.assertEqual(EXAMPLE['parent_id'], sot.parent_id)
 
 
-class TestUserProject(testtools.TestCase):
+class TestUserProject(base.TestCase):
 
     def test_basic(self):
         sot = project.UserProject()
diff --git a/openstack/tests/unit/identity/v3/test_region.py b/openstack/tests/unit/identity/v3/test_region.py
index cf7841683..b3c54f121 100644
--- a/openstack/tests/unit/identity/v3/test_region.py
+++ b/openstack/tests/unit/identity/v3/test_region.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import region
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestRegion(testtools.TestCase):
+class TestRegion(base.TestCase):
 
     def test_basic(self):
         sot = region.Region()
diff --git a/openstack/tests/unit/identity/v3/test_role.py b/openstack/tests/unit/identity/v3/test_role.py
index 7342b7c66..957cfbb99 100644
--- a/openstack/tests/unit/identity/v3/test_role.py
+++ b/openstack/tests/unit/identity/v3/test_role.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import role
 
@@ -22,7 +22,7 @@ EXAMPLE = {
 }
 
 
-class TestRole(testtools.TestCase):
+class TestRole(base.TestCase):
 
     def test_basic(self):
         sot = role.Role()
diff --git a/openstack/tests/unit/identity/v3/test_role_assignment.py b/openstack/tests/unit/identity/v3/test_role_assignment.py
index a0a1e5050..c54df84bd 100644
--- a/openstack/tests/unit/identity/v3/test_role_assignment.py
+++ b/openstack/tests/unit/identity/v3/test_role_assignment.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import role_assignment
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestRoleAssignment(testtools.TestCase):
+class TestRoleAssignment(base.TestCase):
 
     def test_basic(self):
         sot = role_assignment.RoleAssignment()
diff --git a/openstack/tests/unit/identity/v3/test_role_domain_group_assignment.py b/openstack/tests/unit/identity/v3/test_role_domain_group_assignment.py
index 5e0777d20..92b6539a0 100644
--- a/openstack/tests/unit/identity/v3/test_role_domain_group_assignment.py
+++ b/openstack/tests/unit/identity/v3/test_role_domain_group_assignment.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import role_domain_group_assignment
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestRoleDomainGroupAssignment(testtools.TestCase):
+class TestRoleDomainGroupAssignment(base.TestCase):
 
     def test_basic(self):
         sot = role_domain_group_assignment.RoleDomainGroupAssignment()
diff --git a/openstack/tests/unit/identity/v3/test_role_domain_user_assignment.py b/openstack/tests/unit/identity/v3/test_role_domain_user_assignment.py
index cc7de8bd7..bd19a8daf 100644
--- a/openstack/tests/unit/identity/v3/test_role_domain_user_assignment.py
+++ b/openstack/tests/unit/identity/v3/test_role_domain_user_assignment.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import role_domain_user_assignment
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestRoleDomainUserAssignment(testtools.TestCase):
+class TestRoleDomainUserAssignment(base.TestCase):
 
     def test_basic(self):
         sot = role_domain_user_assignment.RoleDomainUserAssignment()
diff --git a/openstack/tests/unit/identity/v3/test_role_project_group_assignment.py b/openstack/tests/unit/identity/v3/test_role_project_group_assignment.py
index 81c96e7db..4070909a9 100644
--- a/openstack/tests/unit/identity/v3/test_role_project_group_assignment.py
+++ b/openstack/tests/unit/identity/v3/test_role_project_group_assignment.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import role_project_group_assignment
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestRoleProjectGroupAssignment(testtools.TestCase):
+class TestRoleProjectGroupAssignment(base.TestCase):
 
     def test_basic(self):
         sot = role_project_group_assignment.RoleProjectGroupAssignment()
diff --git a/openstack/tests/unit/identity/v3/test_role_project_user_assignment.py b/openstack/tests/unit/identity/v3/test_role_project_user_assignment.py
index 5314c0bc5..c04ffdaa1 100644
--- a/openstack/tests/unit/identity/v3/test_role_project_user_assignment.py
+++ b/openstack/tests/unit/identity/v3/test_role_project_user_assignment.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import role_project_user_assignment
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestRoleProjectUserAssignment(testtools.TestCase):
+class TestRoleProjectUserAssignment(base.TestCase):
 
     def test_basic(self):
         sot = role_project_user_assignment.RoleProjectUserAssignment()
diff --git a/openstack/tests/unit/identity/v3/test_service.py b/openstack/tests/unit/identity/v3/test_service.py
index be321a22a..0abceb6ea 100644
--- a/openstack/tests/unit/identity/v3/test_service.py
+++ b/openstack/tests/unit/identity/v3/test_service.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import service
 
@@ -25,7 +25,7 @@ EXAMPLE = {
 }
 
 
-class TestService(testtools.TestCase):
+class TestService(base.TestCase):
 
     def test_basic(self):
         sot = service.Service()
diff --git a/openstack/tests/unit/identity/v3/test_trust.py b/openstack/tests/unit/identity/v3/test_trust.py
index de5c07c6c..258a6ce8e 100644
--- a/openstack/tests/unit/identity/v3/test_trust.py
+++ b/openstack/tests/unit/identity/v3/test_trust.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import trust
 
@@ -32,7 +32,7 @@ EXAMPLE = {
 }
 
 
-class TestTrust(testtools.TestCase):
+class TestTrust(base.TestCase):
 
     def test_basic(self):
         sot = trust.Trust()
diff --git a/openstack/tests/unit/identity/v3/test_user.py b/openstack/tests/unit/identity/v3/test_user.py
index 1f746d111..d09835747 100644
--- a/openstack/tests/unit/identity/v3/test_user.py
+++ b/openstack/tests/unit/identity/v3/test_user.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity.v3 import user
 
@@ -29,7 +29,7 @@ EXAMPLE = {
 }
 
 
-class TestUser(testtools.TestCase):
+class TestUser(base.TestCase):
 
     def test_basic(self):
         sot = user.User()
diff --git a/openstack/tests/unit/image/test_image_service.py b/openstack/tests/unit/image/test_image_service.py
index adc641255..236227430 100644
--- a/openstack/tests/unit/image/test_image_service.py
+++ b/openstack/tests/unit/image/test_image_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.image import image_service
 
 
-class TestImageService(testtools.TestCase):
+class TestImageService(base.TestCase):
 
     def test_service(self):
         sot = image_service.ImageService()
diff --git a/openstack/tests/unit/image/v1/test_image.py b/openstack/tests/unit/image/v1/test_image.py
index 4f0a4554d..d40e73535 100644
--- a/openstack/tests/unit/image/v1/test_image.py
+++ b/openstack/tests/unit/image/v1/test_image.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.image.v1 import image
 
@@ -36,7 +36,7 @@ EXAMPLE = {
 }
 
 
-class TestImage(testtools.TestCase):
+class TestImage(base.TestCase):
 
     def test_basic(self):
         sot = image.Image()
diff --git a/openstack/tests/unit/image/v2/test_image.py b/openstack/tests/unit/image/v2/test_image.py
index 2ad47095c..20098b6c4 100644
--- a/openstack/tests/unit/image/v2/test_image.py
+++ b/openstack/tests/unit/image/v2/test_image.py
@@ -16,7 +16,7 @@ import operator
 from keystoneauth1 import adapter
 import mock
 import requests
-import testtools
+from openstack.tests.unit import base
 
 from openstack import exceptions
 from openstack.image.v2 import image
@@ -94,7 +94,7 @@ class FakeResponse(object):
         return self.body
 
 
-class TestImage(testtools.TestCase):
+class TestImage(base.TestCase):
 
     def setUp(self):
         super(TestImage, self).setUp()
diff --git a/openstack/tests/unit/image/v2/test_member.py b/openstack/tests/unit/image/v2/test_member.py
index 993639f52..8a3e35e50 100644
--- a/openstack/tests/unit/image/v2/test_member.py
+++ b/openstack/tests/unit/image/v2/test_member.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.image.v2 import member
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestMember(testtools.TestCase):
+class TestMember(base.TestCase):
     def test_basic(self):
         sot = member.Member()
         self.assertIsNone(sot.resource_key)
diff --git a/openstack/tests/unit/key_manager/test_key_management_service.py b/openstack/tests/unit/key_manager/test_key_management_service.py
index b458daf73..4024f2ab7 100644
--- a/openstack/tests/unit/key_manager/test_key_management_service.py
+++ b/openstack/tests/unit/key_manager/test_key_management_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.key_manager import key_manager_service
 
 
-class TestKeyManagerService(testtools.TestCase):
+class TestKeyManagerService(base.TestCase):
 
     def test_service(self):
         sot = key_manager_service.KeyManagerService()
diff --git a/openstack/tests/unit/key_manager/v1/test_container.py b/openstack/tests/unit/key_manager/v1/test_container.py
index 98fe51b6f..5bd665ff1 100644
--- a/openstack/tests/unit/key_manager/v1/test_container.py
+++ b/openstack/tests/unit/key_manager/v1/test_container.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.key_manager.v1 import container
 
@@ -28,7 +28,7 @@ EXAMPLE = {
 }
 
 
-class TestContainer(testtools.TestCase):
+class TestContainer(base.TestCase):
 
     def test_basic(self):
         sot = container.Container()
diff --git a/openstack/tests/unit/key_manager/v1/test_order.py b/openstack/tests/unit/key_manager/v1/test_order.py
index 732500522..3c6590ff3 100644
--- a/openstack/tests/unit/key_manager/v1/test_order.py
+++ b/openstack/tests/unit/key_manager/v1/test_order.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.key_manager.v1 import order
 
@@ -31,7 +31,7 @@ EXAMPLE = {
 }
 
 
-class TestOrder(testtools.TestCase):
+class TestOrder(base.TestCase):
 
     def test_basic(self):
         sot = order.Order()
diff --git a/openstack/tests/unit/key_manager/v1/test_secret.py b/openstack/tests/unit/key_manager/v1/test_secret.py
index cbdbfe7c8..2db2d4cb5 100644
--- a/openstack/tests/unit/key_manager/v1/test_secret.py
+++ b/openstack/tests/unit/key_manager/v1/test_secret.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.key_manager.v1 import secret
 
@@ -35,7 +35,7 @@ EXAMPLE = {
 }
 
 
-class TestSecret(testtools.TestCase):
+class TestSecret(base.TestCase):
 
     def test_basic(self):
         sot = secret.Secret()
diff --git a/openstack/tests/unit/load_balancer/test_health_monitor.py b/openstack/tests/unit/load_balancer/test_health_monitor.py
index 515db7b32..771d30de9 100644
--- a/openstack/tests/unit/load_balancer/test_health_monitor.py
+++ b/openstack/tests/unit/load_balancer/test_health_monitor.py
@@ -11,7 +11,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.load_balancer.v2 import health_monitor
@@ -38,7 +38,7 @@ EXAMPLE = {
 }
 
 
-class TestPoolHealthMonitor(testtools.TestCase):
+class TestPoolHealthMonitor(base.TestCase):
 
     def test_basic(self):
         test_hm = health_monitor.HealthMonitor()
diff --git a/openstack/tests/unit/load_balancer/test_l7policy.py b/openstack/tests/unit/load_balancer/test_l7policy.py
index 74742b303..60492436b 100644
--- a/openstack/tests/unit/load_balancer/test_l7policy.py
+++ b/openstack/tests/unit/load_balancer/test_l7policy.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.load_balancer.v2 import l7_policy
@@ -34,7 +34,7 @@ EXAMPLE = {
 }
 
 
-class TestL7Policy(testtools.TestCase):
+class TestL7Policy(base.TestCase):
 
     def test_basic(self):
         test_l7_policy = l7_policy.L7Policy()
diff --git a/openstack/tests/unit/load_balancer/test_l7rule.py b/openstack/tests/unit/load_balancer/test_l7rule.py
index 70046c9b2..6afe925e2 100644
--- a/openstack/tests/unit/load_balancer/test_l7rule.py
+++ b/openstack/tests/unit/load_balancer/test_l7rule.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.load_balancer.v2 import l7_rule
@@ -32,7 +32,7 @@ EXAMPLE = {
 }
 
 
-class TestL7Rule(testtools.TestCase):
+class TestL7Rule(base.TestCase):
 
     def test_basic(self):
         test_l7rule = l7_rule.L7Rule()
diff --git a/openstack/tests/unit/load_balancer/test_listener.py b/openstack/tests/unit/load_balancer/test_listener.py
index 84fddf61c..940b3d878 100644
--- a/openstack/tests/unit/load_balancer/test_listener.py
+++ b/openstack/tests/unit/load_balancer/test_listener.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.load_balancer.v2 import listener
@@ -39,7 +39,7 @@ EXAMPLE = {
 }
 
 
-class TestListener(testtools.TestCase):
+class TestListener(base.TestCase):
 
     def test_basic(self):
         test_listener = listener.Listener()
diff --git a/openstack/tests/unit/load_balancer/test_load_balancer.py b/openstack/tests/unit/load_balancer/test_load_balancer.py
index 98196b312..0831d881d 100644
--- a/openstack/tests/unit/load_balancer/test_load_balancer.py
+++ b/openstack/tests/unit/load_balancer/test_load_balancer.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.load_balancer.v2 import load_balancer
@@ -37,7 +37,7 @@ EXAMPLE = {
 }
 
 
-class TestLoadBalancer(testtools.TestCase):
+class TestLoadBalancer(base.TestCase):
 
     def test_basic(self):
         test_load_balancer = load_balancer.LoadBalancer()
diff --git a/openstack/tests/unit/load_balancer/test_load_balancer_service.py b/openstack/tests/unit/load_balancer/test_load_balancer_service.py
index 6ad82dfc5..9d9a31f83 100644
--- a/openstack/tests/unit/load_balancer/test_load_balancer_service.py
+++ b/openstack/tests/unit/load_balancer/test_load_balancer_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.load_balancer import load_balancer_service as lb_service
 
 
-class TestLoadBalancingService(testtools.TestCase):
+class TestLoadBalancingService(base.TestCase):
 
     def test_service(self):
         sot = lb_service.LoadBalancerService()
diff --git a/openstack/tests/unit/load_balancer/test_member.py b/openstack/tests/unit/load_balancer/test_member.py
index 64446dfe9..7ad614ee5 100644
--- a/openstack/tests/unit/load_balancer/test_member.py
+++ b/openstack/tests/unit/load_balancer/test_member.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.load_balancer.v2 import member
@@ -31,7 +31,7 @@ EXAMPLE = {
 }
 
 
-class TestPoolMember(testtools.TestCase):
+class TestPoolMember(base.TestCase):
 
     def test_basic(self):
         test_member = member.Member()
diff --git a/openstack/tests/unit/load_balancer/test_pool.py b/openstack/tests/unit/load_balancer/test_pool.py
index 2000fb012..557dec3d5 100644
--- a/openstack/tests/unit/load_balancer/test_pool.py
+++ b/openstack/tests/unit/load_balancer/test_pool.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.load_balancer.v2 import pool
@@ -38,7 +38,7 @@ EXAMPLE = {
 }
 
 
-class TestPool(testtools.TestCase):
+class TestPool(base.TestCase):
 
     def test_basic(self):
         test_pool = pool.Pool()
diff --git a/openstack/tests/unit/load_balancer/test_version.py b/openstack/tests/unit/load_balancer/test_version.py
index 8461c4e51..101238544 100644
--- a/openstack/tests/unit/load_balancer/test_version.py
+++ b/openstack/tests/unit/load_balancer/test_version.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.load_balancer import version
 
@@ -22,7 +22,7 @@ EXAMPLE = {
 }
 
 
-class TestVersion(testtools.TestCase):
+class TestVersion(base.TestCase):
 
     def test_basic(self):
         sot = version.Version()
diff --git a/openstack/tests/unit/message/test_message_service.py b/openstack/tests/unit/message/test_message_service.py
index 877a47a5d..d208c4706 100644
--- a/openstack/tests/unit/message/test_message_service.py
+++ b/openstack/tests/unit/message/test_message_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.message import message_service
 
 
-class TestMessageService(testtools.TestCase):
+class TestMessageService(base.TestCase):
 
     def test_service(self):
         sot = message_service.MessageService()
diff --git a/openstack/tests/unit/message/test_version.py b/openstack/tests/unit/message/test_version.py
index aea10840e..e9501e69a 100644
--- a/openstack/tests/unit/message/test_version.py
+++ b/openstack/tests/unit/message/test_version.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.message import version
 
@@ -22,7 +22,7 @@ EXAMPLE = {
 }
 
 
-class TestVersion(testtools.TestCase):
+class TestVersion(base.TestCase):
 
     def test_basic(self):
         sot = version.Version()
diff --git a/openstack/tests/unit/message/v2/test_claim.py b/openstack/tests/unit/message/v2/test_claim.py
index 649f3ca51..9b299ecbc 100644
--- a/openstack/tests/unit/message/v2/test_claim.py
+++ b/openstack/tests/unit/message/v2/test_claim.py
@@ -12,7 +12,7 @@
 
 import copy
 import mock
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.message.v2 import claim
@@ -42,7 +42,7 @@ FAKE2 = {
 }
 
 
-class TestClaim(testtools.TestCase):
+class TestClaim(base.TestCase):
     def test_basic(self):
         sot = claim.Claim()
         self.assertEqual("claims", sot.resources_key)
diff --git a/openstack/tests/unit/message/v2/test_message.py b/openstack/tests/unit/message/v2/test_message.py
index 9a095b1ef..1a876a756 100644
--- a/openstack/tests/unit/message/v2/test_message.py
+++ b/openstack/tests/unit/message/v2/test_message.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.message.v2 import message
@@ -47,7 +47,7 @@ FAKE2 = {
 }
 
 
-class TestMessage(testtools.TestCase):
+class TestMessage(base.TestCase):
     def test_basic(self):
         sot = message.Message()
         self.assertEqual('messages', sot.resources_key)
diff --git a/openstack/tests/unit/message/v2/test_queue.py b/openstack/tests/unit/message/v2/test_queue.py
index 83acc66b4..187d400fb 100644
--- a/openstack/tests/unit/message/v2/test_queue.py
+++ b/openstack/tests/unit/message/v2/test_queue.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.message.v2 import queue
@@ -35,7 +35,7 @@ FAKE2 = {
 }
 
 
-class TestQueue(testtools.TestCase):
+class TestQueue(base.TestCase):
     def test_basic(self):
         sot = queue.Queue()
         self.assertEqual('queues', sot.resources_key)
diff --git a/openstack/tests/unit/message/v2/test_subscription.py b/openstack/tests/unit/message/v2/test_subscription.py
index 9c9c9e510..5567c9cad 100644
--- a/openstack/tests/unit/message/v2/test_subscription.py
+++ b/openstack/tests/unit/message/v2/test_subscription.py
@@ -12,7 +12,7 @@
 
 import copy
 import mock
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.message.v2 import subscription
@@ -48,7 +48,7 @@ FAKE2 = {
 }
 
 
-class TestSubscription(testtools.TestCase):
+class TestSubscription(base.TestCase):
     def test_basic(self):
         sot = subscription.Subscription()
         self.assertEqual("subscriptions", sot.resources_key)
diff --git a/openstack/tests/unit/network/test_network_service.py b/openstack/tests/unit/network/test_network_service.py
index 22980fe36..8ba9407c3 100644
--- a/openstack/tests/unit/network/test_network_service.py
+++ b/openstack/tests/unit/network/test_network_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network import network_service
 
 
-class TestNetworkService(testtools.TestCase):
+class TestNetworkService(base.TestCase):
 
     def test_service(self):
         sot = network_service.NetworkService()
diff --git a/openstack/tests/unit/network/test_version.py b/openstack/tests/unit/network/test_version.py
index 6f3def463..6f9dec05c 100644
--- a/openstack/tests/unit/network/test_version.py
+++ b/openstack/tests/unit/network/test_version.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network import version
 
@@ -22,7 +22,7 @@ EXAMPLE = {
 }
 
 
-class TestVersion(testtools.TestCase):
+class TestVersion(base.TestCase):
 
     def test_basic(self):
         sot = version.Version()
diff --git a/openstack/tests/unit/network/v2/test_address_scope.py b/openstack/tests/unit/network/v2/test_address_scope.py
index ae9cbe85b..a031284f4 100644
--- a/openstack/tests/unit/network/v2/test_address_scope.py
+++ b/openstack/tests/unit/network/v2/test_address_scope.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import address_scope
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestAddressScope(testtools.TestCase):
+class TestAddressScope(base.TestCase):
 
     def test_basic(self):
         sot = address_scope.AddressScope()
diff --git a/openstack/tests/unit/network/v2/test_agent.py b/openstack/tests/unit/network/v2/test_agent.py
index 80bbbbd47..e279905ed 100644
--- a/openstack/tests/unit/network/v2/test_agent.py
+++ b/openstack/tests/unit/network/v2/test_agent.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import agent
 
@@ -34,7 +34,7 @@ EXAMPLE = {
 }
 
 
-class TestAgent(testtools.TestCase):
+class TestAgent(base.TestCase):
 
     def test_basic(self):
         sot = agent.Agent()
@@ -120,7 +120,7 @@ class TestAgent(testtools.TestCase):
                                        json=body)
 
 
-class TestNetworkHostingDHCPAgent(testtools.TestCase):
+class TestNetworkHostingDHCPAgent(base.TestCase):
 
     def test_basic(self):
         net = agent.NetworkHostingDHCPAgent()
@@ -136,7 +136,7 @@ class TestNetworkHostingDHCPAgent(testtools.TestCase):
         self.assertTrue(net.allow_list)
 
 
-class TestRouterL3Agent(testtools.TestCase):
+class TestRouterL3Agent(base.TestCase):
 
     def test_basic(self):
         sot = agent.RouterL3Agent()
diff --git a/openstack/tests/unit/network/v2/test_auto_allocated_topology.py b/openstack/tests/unit/network/v2/test_auto_allocated_topology.py
index 941660a1f..c9853cfa8 100644
--- a/openstack/tests/unit/network/v2/test_auto_allocated_topology.py
+++ b/openstack/tests/unit/network/v2/test_auto_allocated_topology.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import auto_allocated_topology
 
@@ -20,7 +20,7 @@ EXAMPLE = {
 }
 
 
-class TestAutoAllocatedTopology(testtools.TestCase):
+class TestAutoAllocatedTopology(base.TestCase):
 
     def test_basic(self):
         topo = auto_allocated_topology.AutoAllocatedTopology
diff --git a/openstack/tests/unit/network/v2/test_availability_zone.py b/openstack/tests/unit/network/v2/test_availability_zone.py
index 7ab1031e8..67576ca9c 100644
--- a/openstack/tests/unit/network/v2/test_availability_zone.py
+++ b/openstack/tests/unit/network/v2/test_availability_zone.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import availability_zone
 
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestAvailabilityZone(testtools.TestCase):
+class TestAvailabilityZone(base.TestCase):
 
     def test_basic(self):
         sot = availability_zone.AvailabilityZone()
diff --git a/openstack/tests/unit/network/v2/test_extension.py b/openstack/tests/unit/network/v2/test_extension.py
index fd2511b73..bd968746c 100644
--- a/openstack/tests/unit/network/v2/test_extension.py
+++ b/openstack/tests/unit/network/v2/test_extension.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import extension
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestExtension(testtools.TestCase):
+class TestExtension(base.TestCase):
 
     def test_basic(self):
         sot = extension.Extension()
diff --git a/openstack/tests/unit/network/v2/test_flavor.py b/openstack/tests/unit/network/v2/test_flavor.py
index 236511f20..024011b22 100644
--- a/openstack/tests/unit/network/v2/test_flavor.py
+++ b/openstack/tests/unit/network/v2/test_flavor.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import flavor
 
@@ -32,7 +32,7 @@ EXAMPLE = {
 }
 
 
-class TestFlavor(testtools.TestCase):
+class TestFlavor(base.TestCase):
     def test_basic(self):
         flavors = flavor.Flavor()
         self.assertEqual('flavor', flavors.resource_key)
diff --git a/openstack/tests/unit/network/v2/test_floating_ip.py b/openstack/tests/unit/network/v2/test_floating_ip.py
index 81a84fed2..92dc36512 100644
--- a/openstack/tests/unit/network/v2/test_floating_ip.py
+++ b/openstack/tests/unit/network/v2/test_floating_ip.py
@@ -12,7 +12,7 @@
 
 from keystoneauth1 import adapter
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import floating_ip
 
@@ -35,7 +35,7 @@ EXAMPLE = {
 }
 
 
-class TestFloatingIP(testtools.TestCase):
+class TestFloatingIP(base.TestCase):
 
     def test_basic(self):
         sot = floating_ip.FloatingIP()
diff --git a/openstack/tests/unit/network/v2/test_health_monitor.py b/openstack/tests/unit/network/v2/test_health_monitor.py
index 1198a102e..7018ee185 100644
--- a/openstack/tests/unit/network/v2/test_health_monitor.py
+++ b/openstack/tests/unit/network/v2/test_health_monitor.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import health_monitor
 
@@ -32,7 +32,7 @@ EXAMPLE = {
 }
 
 
-class TestHealthMonitor(testtools.TestCase):
+class TestHealthMonitor(base.TestCase):
 
     def test_basic(self):
         sot = health_monitor.HealthMonitor()
diff --git a/openstack/tests/unit/network/v2/test_listener.py b/openstack/tests/unit/network/v2/test_listener.py
index 4eb550e0e..55db10895 100644
--- a/openstack/tests/unit/network/v2/test_listener.py
+++ b/openstack/tests/unit/network/v2/test_listener.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import listener
 
@@ -32,7 +32,7 @@ EXAMPLE = {
 }
 
 
-class TestListener(testtools.TestCase):
+class TestListener(base.TestCase):
 
     def test_basic(self):
         sot = listener.Listener()
diff --git a/openstack/tests/unit/network/v2/test_load_balancer.py b/openstack/tests/unit/network/v2/test_load_balancer.py
index 9a657c4b9..4283f4241 100644
--- a/openstack/tests/unit/network/v2/test_load_balancer.py
+++ b/openstack/tests/unit/network/v2/test_load_balancer.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import load_balancer
 
@@ -32,7 +32,7 @@ EXAMPLE = {
 }
 
 
-class TestLoadBalancer(testtools.TestCase):
+class TestLoadBalancer(base.TestCase):
 
     def test_basic(self):
         sot = load_balancer.LoadBalancer()
diff --git a/openstack/tests/unit/network/v2/test_metering_label.py b/openstack/tests/unit/network/v2/test_metering_label.py
index 4d1e57a98..af9d293d5 100644
--- a/openstack/tests/unit/network/v2/test_metering_label.py
+++ b/openstack/tests/unit/network/v2/test_metering_label.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import metering_label
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestMeteringLabel(testtools.TestCase):
+class TestMeteringLabel(base.TestCase):
 
     def test_basic(self):
         sot = metering_label.MeteringLabel()
diff --git a/openstack/tests/unit/network/v2/test_metering_label_rule.py b/openstack/tests/unit/network/v2/test_metering_label_rule.py
index 03c134b42..b6b9a1317 100644
--- a/openstack/tests/unit/network/v2/test_metering_label_rule.py
+++ b/openstack/tests/unit/network/v2/test_metering_label_rule.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import metering_label_rule
 
@@ -25,7 +25,7 @@ EXAMPLE = {
 }
 
 
-class TestMeteringLabelRule(testtools.TestCase):
+class TestMeteringLabelRule(base.TestCase):
 
     def test_basic(self):
         sot = metering_label_rule.MeteringLabelRule()
diff --git a/openstack/tests/unit/network/v2/test_network.py b/openstack/tests/unit/network/v2/test_network.py
index 3b0c64630..787cdbef1 100644
--- a/openstack/tests/unit/network/v2/test_network.py
+++ b/openstack/tests/unit/network/v2/test_network.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import network
 
@@ -45,7 +45,7 @@ EXAMPLE = {
 }
 
 
-class TestNetwork(testtools.TestCase):
+class TestNetwork(base.TestCase):
 
     def test_basic(self):
         sot = network.Network()
@@ -119,7 +119,7 @@ class TestNetwork(testtools.TestCase):
             sot._query_mapping._mapping)
 
 
-class TestDHCPAgentHostingNetwork(testtools.TestCase):
+class TestDHCPAgentHostingNetwork(base.TestCase):
 
     def test_basic(self):
         net = network.DHCPAgentHostingNetwork()
diff --git a/openstack/tests/unit/network/v2/test_network_ip_availability.py b/openstack/tests/unit/network/v2/test_network_ip_availability.py
index 3d0246b19..0dbecc1f2 100644
--- a/openstack/tests/unit/network/v2/test_network_ip_availability.py
+++ b/openstack/tests/unit/network/v2/test_network_ip_availability.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import network_ip_availability
 
@@ -38,7 +38,7 @@ EXAMPLE_WITH_OPTIONAL = {
 }
 
 
-class TestNetworkIPAvailability(testtools.TestCase):
+class TestNetworkIPAvailability(base.TestCase):
 
     def test_basic(self):
         sot = network_ip_availability.NetworkIPAvailability()
diff --git a/openstack/tests/unit/network/v2/test_pool.py b/openstack/tests/unit/network/v2/test_pool.py
index fb580812d..3357c1a23 100644
--- a/openstack/tests/unit/network/v2/test_pool.py
+++ b/openstack/tests/unit/network/v2/test_pool.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import pool
 
@@ -39,7 +39,7 @@ EXAMPLE = {
 }
 
 
-class TestPool(testtools.TestCase):
+class TestPool(base.TestCase):
 
     def test_basic(self):
         sot = pool.Pool()
diff --git a/openstack/tests/unit/network/v2/test_pool_member.py b/openstack/tests/unit/network/v2/test_pool_member.py
index f175cb35b..dd7e9aa01 100644
--- a/openstack/tests/unit/network/v2/test_pool_member.py
+++ b/openstack/tests/unit/network/v2/test_pool_member.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import pool_member
 
@@ -28,7 +28,7 @@ EXAMPLE = {
 }
 
 
-class TestPoolMember(testtools.TestCase):
+class TestPoolMember(base.TestCase):
 
     def test_basic(self):
         sot = pool_member.PoolMember()
diff --git a/openstack/tests/unit/network/v2/test_port.py b/openstack/tests/unit/network/v2/test_port.py
index 2bfbcdac3..09ebf167f 100644
--- a/openstack/tests/unit/network/v2/test_port.py
+++ b/openstack/tests/unit/network/v2/test_port.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import port
 
@@ -57,7 +57,7 @@ EXAMPLE = {
 }
 
 
-class TestPort(testtools.TestCase):
+class TestPort(base.TestCase):
 
     def test_basic(self):
         sot = port.Port()
diff --git a/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py b/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py
index f6fc9fd3c..cfb77f332 100644
--- a/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py
+++ b/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.network.v2 import qos_bandwidth_limit_rule
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestQoSBandwidthLimitRule(testtools.TestCase):
+class TestQoSBandwidthLimitRule(base.TestCase):
 
     def test_basic(self):
         sot = qos_bandwidth_limit_rule.QoSBandwidthLimitRule()
diff --git a/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py b/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py
index 46bffd1cd..11132fc70 100644
--- a/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py
+++ b/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.network.v2 import qos_dscp_marking_rule
@@ -22,7 +22,7 @@ EXAMPLE = {
 }
 
 
-class TestQoSDSCPMarkingRule(testtools.TestCase):
+class TestQoSDSCPMarkingRule(base.TestCase):
 
     def test_basic(self):
         sot = qos_dscp_marking_rule.QoSDSCPMarkingRule()
diff --git a/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py b/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py
index f6b2f4422..090e8d198 100644
--- a/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py
+++ b/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.network.v2 import qos_minimum_bandwidth_rule
@@ -23,7 +23,7 @@ EXAMPLE = {
 }
 
 
-class TestQoSMinimumBandwidthRule(testtools.TestCase):
+class TestQoSMinimumBandwidthRule(base.TestCase):
 
     def test_basic(self):
         sot = qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule()
diff --git a/openstack/tests/unit/network/v2/test_qos_policy.py b/openstack/tests/unit/network/v2/test_qos_policy.py
index 7c5e6c4de..525f8f33d 100644
--- a/openstack/tests/unit/network/v2/test_qos_policy.py
+++ b/openstack/tests/unit/network/v2/test_qos_policy.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack.network.v2 import qos_policy
@@ -26,7 +26,7 @@ EXAMPLE = {
 }
 
 
-class TestQoSPolicy(testtools.TestCase):
+class TestQoSPolicy(base.TestCase):
 
     def test_basic(self):
         sot = qos_policy.QoSPolicy()
diff --git a/openstack/tests/unit/network/v2/test_qos_rule_type.py b/openstack/tests/unit/network/v2/test_qos_rule_type.py
index f0dc06fee..eb3c12d4b 100644
--- a/openstack/tests/unit/network/v2/test_qos_rule_type.py
+++ b/openstack/tests/unit/network/v2/test_qos_rule_type.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import qos_rule_type
 
@@ -35,7 +35,7 @@ EXAMPLE = {
 }
 
 
-class TestQoSRuleType(testtools.TestCase):
+class TestQoSRuleType(base.TestCase):
 
     def test_basic(self):
         sot = qos_rule_type.QoSRuleType()
diff --git a/openstack/tests/unit/network/v2/test_quota.py b/openstack/tests/unit/network/v2/test_quota.py
index 1f35281e5..00a54f999 100644
--- a/openstack/tests/unit/network/v2/test_quota.py
+++ b/openstack/tests/unit/network/v2/test_quota.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import quota
 from openstack import resource
@@ -35,7 +35,7 @@ EXAMPLE = {
 }
 
 
-class TestQuota(testtools.TestCase):
+class TestQuota(base.TestCase):
 
     def test_basic(self):
         sot = quota.Quota()
@@ -82,7 +82,7 @@ class TestQuota(testtools.TestCase):
                          resource.Resource._get_id(quota_obj))
 
 
-class TestQuotaDefault(testtools.TestCase):
+class TestQuotaDefault(base.TestCase):
 
     def test_basic(self):
         sot = quota.QuotaDefault()
diff --git a/openstack/tests/unit/network/v2/test_rbac_policy.py b/openstack/tests/unit/network/v2/test_rbac_policy.py
index c8189c9c2..f42237a7f 100644
--- a/openstack/tests/unit/network/v2/test_rbac_policy.py
+++ b/openstack/tests/unit/network/v2/test_rbac_policy.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import rbac_policy
 
@@ -24,7 +24,7 @@ EXAMPLE = {
 }
 
 
-class TestRBACPolicy(testtools.TestCase):
+class TestRBACPolicy(base.TestCase):
 
     def test_basic(self):
         sot = rbac_policy.RBACPolicy()
diff --git a/openstack/tests/unit/network/v2/test_router.py b/openstack/tests/unit/network/v2/test_router.py
index 8cf9359ca..2bc12d26e 100644
--- a/openstack/tests/unit/network/v2/test_router.py
+++ b/openstack/tests/unit/network/v2/test_router.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import router
 
@@ -58,7 +58,7 @@ EXAMPLE_WITH_OPTIONAL = {
 }
 
 
-class TestRouter(testtools.TestCase):
+class TestRouter(base.TestCase):
 
     def test_basic(self):
         sot = router.Router()
@@ -205,7 +205,7 @@ class TestRouter(testtools.TestCase):
                                     json=body)
 
 
-class TestL3AgentRouters(testtools.TestCase):
+class TestL3AgentRouters(base.TestCase):
 
     def test_basic(self):
         sot = router.L3AgentRouter()
diff --git a/openstack/tests/unit/network/v2/test_security_group.py b/openstack/tests/unit/network/v2/test_security_group.py
index 2d18edb0c..73528f0c5 100644
--- a/openstack/tests/unit/network/v2/test_security_group.py
+++ b/openstack/tests/unit/network/v2/test_security_group.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import security_group
 
@@ -61,7 +61,7 @@ EXAMPLE = {
 }
 
 
-class TestSecurityGroup(testtools.TestCase):
+class TestSecurityGroup(base.TestCase):
 
     def test_basic(self):
         sot = security_group.SecurityGroup()
diff --git a/openstack/tests/unit/network/v2/test_security_group_rule.py b/openstack/tests/unit/network/v2/test_security_group_rule.py
index 5ad00d91b..5292099c9 100644
--- a/openstack/tests/unit/network/v2/test_security_group_rule.py
+++ b/openstack/tests/unit/network/v2/test_security_group_rule.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import security_group_rule
 
@@ -33,7 +33,7 @@ EXAMPLE = {
 }
 
 
-class TestSecurityGroupRule(testtools.TestCase):
+class TestSecurityGroupRule(base.TestCase):
 
     def test_basic(self):
         sot = security_group_rule.SecurityGroupRule()
diff --git a/openstack/tests/unit/network/v2/test_segment.py b/openstack/tests/unit/network/v2/test_segment.py
index 307f7568a..e651fd6d6 100644
--- a/openstack/tests/unit/network/v2/test_segment.py
+++ b/openstack/tests/unit/network/v2/test_segment.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import segment
 
@@ -26,7 +26,7 @@ EXAMPLE = {
 }
 
 
-class TestSegment(testtools.TestCase):
+class TestSegment(base.TestCase):
 
     def test_basic(self):
         sot = segment.Segment()
diff --git a/openstack/tests/unit/network/v2/test_service_profile.py b/openstack/tests/unit/network/v2/test_service_profile.py
index 232cab5d9..e5961b4b9 100644
--- a/openstack/tests/unit/network/v2/test_service_profile.py
+++ b/openstack/tests/unit/network/v2/test_service_profile.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import service_profile
 
@@ -28,7 +28,7 @@ EXAMPLE = {
 }
 
 
-class TestServiceProfile(testtools.TestCase):
+class TestServiceProfile(base.TestCase):
     def test_basic(self):
         service_profiles = service_profile.ServiceProfile()
         self.assertEqual('service_profile', service_profiles.resource_key)
diff --git a/openstack/tests/unit/network/v2/test_service_provider.py b/openstack/tests/unit/network/v2/test_service_provider.py
index bc946a03d..e3c3448cc 100644
--- a/openstack/tests/unit/network/v2/test_service_provider.py
+++ b/openstack/tests/unit/network/v2/test_service_provider.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import service_provider
 
@@ -22,7 +22,7 @@ EXAMPLE = {
 }
 
 
-class TestServiceProvider(testtools.TestCase):
+class TestServiceProvider(base.TestCase):
 
     def test_basic(self):
         sot = service_provider.ServiceProvider()
diff --git a/openstack/tests/unit/network/v2/test_subnet.py b/openstack/tests/unit/network/v2/test_subnet.py
index 2e344a9a8..9d1224405 100644
--- a/openstack/tests/unit/network/v2/test_subnet.py
+++ b/openstack/tests/unit/network/v2/test_subnet.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import subnet
 
@@ -40,7 +40,7 @@ EXAMPLE = {
 }
 
 
-class TestSubnet(testtools.TestCase):
+class TestSubnet(base.TestCase):
 
     def test_basic(self):
         sot = subnet.Subnet()
diff --git a/openstack/tests/unit/network/v2/test_subnet_pool.py b/openstack/tests/unit/network/v2/test_subnet_pool.py
index 908a03781..7751820c8 100644
--- a/openstack/tests/unit/network/v2/test_subnet_pool.py
+++ b/openstack/tests/unit/network/v2/test_subnet_pool.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import subnet_pool
 
@@ -35,7 +35,7 @@ EXAMPLE = {
 }
 
 
-class TestSubnetpool(testtools.TestCase):
+class TestSubnetpool(base.TestCase):
 
     def test_basic(self):
         sot = subnet_pool.SubnetPool()
diff --git a/openstack/tests/unit/network/v2/test_tag.py b/openstack/tests/unit/network/v2/test_tag.py
index ff7270d2d..fdfb8d51d 100644
--- a/openstack/tests/unit/network/v2/test_tag.py
+++ b/openstack/tests/unit/network/v2/test_tag.py
@@ -12,7 +12,7 @@
 
 import inspect
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import network
 import openstack.network.v2 as network_resources
@@ -21,7 +21,7 @@ from openstack.network.v2.tag import TagMixin
 ID = 'IDENTIFIER'
 
 
-class TestTag(testtools.TestCase):
+class TestTag(base.TestCase):
 
     @staticmethod
     def _create_network_resource(tags=None):
diff --git a/openstack/tests/unit/network/v2/test_vpn_service.py b/openstack/tests/unit/network/v2/test_vpn_service.py
index a5b54590c..662f461ef 100644
--- a/openstack/tests/unit/network/v2/test_vpn_service.py
+++ b/openstack/tests/unit/network/v2/test_vpn_service.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.network.v2 import vpn_service
 
@@ -29,7 +29,7 @@ EXAMPLE = {
 }
 
 
-class TestVPNService(testtools.TestCase):
+class TestVPNService(base.TestCase):
 
     def test_basic(self):
         sot = vpn_service.VPNService()
diff --git a/openstack/tests/unit/object_store/test_object_store_service.py b/openstack/tests/unit/object_store/test_object_store_service.py
index a2707a134..65d20657b 100644
--- a/openstack/tests/unit/object_store/test_object_store_service.py
+++ b/openstack/tests/unit/object_store/test_object_store_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.object_store import object_store_service
 
 
-class TestObjectStoreService(testtools.TestCase):
+class TestObjectStoreService(base.TestCase):
 
     def test_service(self):
         sot = object_store_service.ObjectStoreService()
diff --git a/openstack/tests/unit/object_store/v1/test_account.py b/openstack/tests/unit/object_store/v1/test_account.py
index f498fa41b..50f511a0f 100644
--- a/openstack/tests/unit/object_store/v1/test_account.py
+++ b/openstack/tests/unit/object_store/v1/test_account.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.object_store.v1 import account
 
@@ -29,7 +29,7 @@ ACCOUNT_EXAMPLE = {
 }
 
 
-class TestAccount(testtools.TestCase):
+class TestAccount(base.TestCase):
 
     def test_basic(self):
         sot = account.Account(**ACCOUNT_EXAMPLE)
diff --git a/openstack/tests/unit/object_store/v1/test_container.py b/openstack/tests/unit/object_store/v1/test_container.py
index 5c5681c1e..dd0216a2b 100644
--- a/openstack/tests/unit/object_store/v1/test_container.py
+++ b/openstack/tests/unit/object_store/v1/test_container.py
@@ -14,7 +14,7 @@ from openstack.object_store.v1 import container
 from openstack.tests.unit import base
 
 
-class TestContainer(base.RequestsMockTestCase):
+class TestContainer(base.TestCase):
 
     def setUp(self):
         super(TestContainer, self).setUp()
diff --git a/openstack/tests/unit/orchestration/test_orchestration_service.py b/openstack/tests/unit/orchestration/test_orchestration_service.py
index 9d0840add..aefb37110 100644
--- a/openstack/tests/unit/orchestration/test_orchestration_service.py
+++ b/openstack/tests/unit/orchestration/test_orchestration_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.orchestration import orchestration_service
 
 
-class TestOrchestrationService(testtools.TestCase):
+class TestOrchestrationService(base.TestCase):
 
     def test_service(self):
         sot = orchestration_service.OrchestrationService()
diff --git a/openstack/tests/unit/orchestration/test_version.py b/openstack/tests/unit/orchestration/test_version.py
index 5da8a37c7..464286dbe 100644
--- a/openstack/tests/unit/orchestration/test_version.py
+++ b/openstack/tests/unit/orchestration/test_version.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.orchestration import version
 
@@ -22,7 +22,7 @@ EXAMPLE = {
 }
 
 
-class TestVersion(testtools.TestCase):
+class TestVersion(base.TestCase):
 
     def test_basic(self):
         sot = version.Version()
diff --git a/openstack/tests/unit/orchestration/v1/test_resource.py b/openstack/tests/unit/orchestration/v1/test_resource.py
index b4080ac3f..9e1968fe0 100644
--- a/openstack/tests/unit/orchestration/v1/test_resource.py
+++ b/openstack/tests/unit/orchestration/v1/test_resource.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.orchestration.v1 import resource
 
@@ -36,7 +36,7 @@ FAKE = {
 }
 
 
-class TestResource(testtools.TestCase):
+class TestResource(base.TestCase):
 
     def test_basic(self):
         sot = resource.Resource()
diff --git a/openstack/tests/unit/orchestration/v1/test_software_config.py b/openstack/tests/unit/orchestration/v1/test_software_config.py
index aa752a7ba..02dad3152 100644
--- a/openstack/tests/unit/orchestration/v1/test_software_config.py
+++ b/openstack/tests/unit/orchestration/v1/test_software_config.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.orchestration.v1 import software_config
 
@@ -29,7 +29,7 @@ FAKE = {
 }
 
 
-class TestSoftwareConfig(testtools.TestCase):
+class TestSoftwareConfig(base.TestCase):
 
     def test_basic(self):
         sot = software_config.SoftwareConfig()
diff --git a/openstack/tests/unit/orchestration/v1/test_software_deployment.py b/openstack/tests/unit/orchestration/v1/test_software_deployment.py
index cb03ac0fd..fb242ebeb 100644
--- a/openstack/tests/unit/orchestration/v1/test_software_deployment.py
+++ b/openstack/tests/unit/orchestration/v1/test_software_deployment.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.orchestration.v1 import software_deployment
 
@@ -29,7 +29,7 @@ FAKE = {
 }
 
 
-class TestSoftwareDeployment(testtools.TestCase):
+class TestSoftwareDeployment(base.TestCase):
 
     def test_basic(self):
         sot = software_deployment.SoftwareDeployment()
diff --git a/openstack/tests/unit/orchestration/v1/test_stack.py b/openstack/tests/unit/orchestration/v1/test_stack.py
index 802b07660..dc1a19b30 100644
--- a/openstack/tests/unit/orchestration/v1/test_stack.py
+++ b/openstack/tests/unit/orchestration/v1/test_stack.py
@@ -12,7 +12,7 @@
 
 import mock
 import six
-import testtools
+from openstack.tests.unit import base
 
 from openstack import exceptions
 from openstack.orchestration.v1 import stack
@@ -51,7 +51,7 @@ FAKE_CREATE_RESPONSE = {
 }
 
 
-class TestStack(testtools.TestCase):
+class TestStack(base.TestCase):
 
     def test_basic(self):
         sot = stack.Stack()
@@ -138,7 +138,7 @@ class TestStack(testtools.TestCase):
                          six.text_type(ex))
 
 
-class TestStackPreview(testtools.TestCase):
+class TestStackPreview(base.TestCase):
 
     def test_basic(self):
         sot = stack.StackPreview()
diff --git a/openstack/tests/unit/orchestration/v1/test_stack_environment.py b/openstack/tests/unit/orchestration/v1/test_stack_environment.py
index 93b7286e1..692dc93cc 100644
--- a/openstack/tests/unit/orchestration/v1/test_stack_environment.py
+++ b/openstack/tests/unit/orchestration/v1/test_stack_environment.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.orchestration.v1 import stack_environment as se
 
@@ -36,7 +36,7 @@ FAKE = {
 }
 
 
-class TestStackTemplate(testtools.TestCase):
+class TestStackTemplate(base.TestCase):
 
     def test_basic(self):
         sot = se.StackEnvironment()
diff --git a/openstack/tests/unit/orchestration/v1/test_stack_files.py b/openstack/tests/unit/orchestration/v1/test_stack_files.py
index 7e7aa6c80..4c4f06f9c 100644
--- a/openstack/tests/unit/orchestration/v1/test_stack_files.py
+++ b/openstack/tests/unit/orchestration/v1/test_stack_files.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.orchestration.v1 import stack_files as sf
 from openstack import resource
@@ -22,7 +22,7 @@ FAKE = {
 }
 
 
-class TestStackFiles(testtools.TestCase):
+class TestStackFiles(base.TestCase):
 
     def test_basic(self):
         sot = sf.StackFiles()
diff --git a/openstack/tests/unit/orchestration/v1/test_stack_template.py b/openstack/tests/unit/orchestration/v1/test_stack_template.py
index 29cf5437d..7ea88142b 100644
--- a/openstack/tests/unit/orchestration/v1/test_stack_template.py
+++ b/openstack/tests/unit/orchestration/v1/test_stack_template.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import copy
-import testtools
+from openstack.tests.unit import base
 
 from openstack.orchestration.v1 import stack_template
 
@@ -36,7 +36,7 @@ FAKE = {
 }
 
 
-class TestStackTemplate(testtools.TestCase):
+class TestStackTemplate(base.TestCase):
 
     def test_basic(self):
         sot = stack_template.StackTemplate()
diff --git a/openstack/tests/unit/orchestration/v1/test_template.py b/openstack/tests/unit/orchestration/v1/test_template.py
index c127d9cab..7cc91f3da 100644
--- a/openstack/tests/unit/orchestration/v1/test_template.py
+++ b/openstack/tests/unit/orchestration/v1/test_template.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack.orchestration.v1 import template
 from openstack import resource
@@ -31,7 +31,7 @@ FAKE = {
 }
 
 
-class TestTemplate(testtools.TestCase):
+class TestTemplate(base.TestCase):
 
     def test_basic(self):
         sot = template.Template()
diff --git a/openstack/tests/unit/test_connection.py b/openstack/tests/unit/test_connection.py
index b4f34f108..1c77aa403 100644
--- a/openstack/tests/unit/test_connection.py
+++ b/openstack/tests/unit/test_connection.py
@@ -57,7 +57,7 @@ clouds:
            cacert=CONFIG_CACERT)
 
 
-class TestConnection(base.RequestsMockTestCase):
+class TestConnection(base.TestCase):
 
     def setUp(self):
         super(TestConnection, self).setUp()
@@ -194,7 +194,7 @@ class TestConnection(base.RequestsMockTestCase):
             profile=prof)
 
 
-class TestAuthorize(base.RequestsMockTestCase):
+class TestAuthorize(base.TestCase):
 
     def test_authorize_works(self):
         res = self.conn.authorize()
diff --git a/openstack/tests/unit/test_exceptions.py b/openstack/tests/unit/test_exceptions.py
index 2cd55721a..16841ecb6 100644
--- a/openstack/tests/unit/test_exceptions.py
+++ b/openstack/tests/unit/test_exceptions.py
@@ -11,13 +11,13 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 import uuid
 
 from openstack import exceptions
 
 
-class Test_Exception(testtools.TestCase):
+class Test_Exception(base.TestCase):
     def test_method_not_supported(self):
         exc = exceptions.MethodNotSupported(self.__class__, 'list')
         expected = ('The list method is not supported for ' +
@@ -25,7 +25,7 @@ class Test_Exception(testtools.TestCase):
         self.assertEqual(expected, str(exc))
 
 
-class Test_HttpException(testtools.TestCase):
+class Test_HttpException(base.TestCase):
 
     def setUp(self):
         super(Test_HttpException, self).setUp()
@@ -59,7 +59,7 @@ class Test_HttpException(testtools.TestCase):
         self.assertEqual(http_status, exc.status_code)
 
 
-class TestRaiseFromResponse(testtools.TestCase):
+class TestRaiseFromResponse(base.TestCase):
 
     def setUp(self):
         super(TestRaiseFromResponse, self).setUp()
diff --git a/openstack/tests/unit/test_format.py b/openstack/tests/unit/test_format.py
index f78454dd5..6c7bb04f5 100644
--- a/openstack/tests/unit/test_format.py
+++ b/openstack/tests/unit/test_format.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack import format
 
 
-class TestBoolStrFormatter(testtools.TestCase):
+class TestBoolStrFormatter(base.TestCase):
 
     def test_deserialize(self):
         self.assertTrue(format.BoolStr.deserialize(True))
diff --git a/openstack/tests/unit/test_proxy.py b/openstack/tests/unit/test_proxy.py
index 45880683c..120ee77a8 100644
--- a/openstack/tests/unit/test_proxy.py
+++ b/openstack/tests/unit/test_proxy.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import mock
-import testtools
+from openstack.tests.unit import base
 
 from openstack import exceptions
 from openstack import proxy
@@ -42,7 +42,7 @@ class HeadableResource(resource.Resource):
     allow_head = True
 
 
-class TestProxyPrivate(testtools.TestCase):
+class TestProxyPrivate(base.TestCase):
 
     def setUp(self):
         super(TestProxyPrivate, self).setUp()
@@ -158,7 +158,7 @@ class TestProxyPrivate(testtools.TestCase):
         self.assertEqual(result, res)
 
 
-class TestProxyDelete(testtools.TestCase):
+class TestProxyDelete(base.TestCase):
 
     def setUp(self):
         super(TestProxyDelete, self).setUp()
@@ -214,7 +214,7 @@ class TestProxyDelete(testtools.TestCase):
                           DeleteableResource, self.res, ignore_missing=False)
 
 
-class TestProxyUpdate(testtools.TestCase):
+class TestProxyUpdate(base.TestCase):
 
     def setUp(self):
         super(TestProxyUpdate, self).setUp()
@@ -247,7 +247,7 @@ class TestProxyUpdate(testtools.TestCase):
         self.res.update.assert_called_once_with(self.sot)
 
 
-class TestProxyCreate(testtools.TestCase):
+class TestProxyCreate(base.TestCase):
 
     def setUp(self):
         super(TestProxyCreate, self).setUp()
@@ -271,7 +271,7 @@ class TestProxyCreate(testtools.TestCase):
         self.res.create.assert_called_once_with(self.sot)
 
 
-class TestProxyGet(testtools.TestCase):
+class TestProxyGet(base.TestCase):
 
     def setUp(self):
         super(TestProxyGet, self).setUp()
@@ -321,7 +321,7 @@ class TestProxyGet(testtools.TestCase):
             "test", self.sot._get, RetrieveableResource, self.res)
 
 
-class TestProxyList(testtools.TestCase):
+class TestProxyList(base.TestCase):
 
     def setUp(self):
         super(TestProxyList, self).setUp()
@@ -349,7 +349,7 @@ class TestProxyList(testtools.TestCase):
         self._test_list(False)
 
 
-class TestProxyHead(testtools.TestCase):
+class TestProxyHead(base.TestCase):
 
     def setUp(self):
         super(TestProxyHead, self).setUp()
@@ -380,7 +380,7 @@ class TestProxyHead(testtools.TestCase):
         self.assertEqual(rv, self.fake_result)
 
 
-class TestProxyWaits(testtools.TestCase):
+class TestProxyWaits(base.TestCase):
 
     def setUp(self):
         super(TestProxyWaits, self).setUp()
diff --git a/openstack/tests/unit/test_service_filter.py b/openstack/tests/unit/test_service_filter.py
index 7d0129917..d63c623a5 100644
--- a/openstack/tests/unit/test_service_filter.py
+++ b/openstack/tests/unit/test_service_filter.py
@@ -10,20 +10,20 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.identity import identity_service
 from openstack import service_filter
 
 
-class TestValidVersion(testtools.TestCase):
+class TestValidVersion(base.TestCase):
     def test_constructor(self):
         sot = service_filter.ValidVersion('v1.0', 'v1')
         self.assertEqual('v1.0', sot.module)
         self.assertEqual('v1', sot.path)
 
 
-class TestServiceFilter(testtools.TestCase):
+class TestServiceFilter(base.TestCase):
     def test_init(self):
         sot = service_filter.ServiceFilter(
             'ServiceType', region='REGION1', service_name='ServiceName',
diff --git a/openstack/tests/unit/test_utils.py b/openstack/tests/unit/test_utils.py
index 1110330ff..aa947ffa1 100644
--- a/openstack/tests/unit/test_utils.py
+++ b/openstack/tests/unit/test_utils.py
@@ -13,14 +13,14 @@
 import logging
 import mock
 import sys
-import testtools
+from openstack.tests.unit import base
 
 import fixtures
 
 from openstack import utils
 
 
-class Test_enable_logging(testtools.TestCase):
+class Test_enable_logging(base.TestCase):
 
     def setUp(self):
         super(Test_enable_logging, self).setUp()
@@ -89,7 +89,7 @@ class Test_enable_logging(testtools.TestCase):
         self._file_tests(logging.INFO, False)
 
 
-class Test_urljoin(testtools.TestCase):
+class Test_urljoin(base.TestCase):
 
     def test_strings(self):
         root = "http://www.example.com"
diff --git a/openstack/tests/unit/workflow/test_execution.py b/openstack/tests/unit/workflow/test_execution.py
index bb8a4c001..a79a2b463 100644
--- a/openstack/tests/unit/workflow/test_execution.py
+++ b/openstack/tests/unit/workflow/test_execution.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.workflow.v2 import execution
 
@@ -27,7 +27,7 @@ FAKE = {
 }
 
 
-class TestExecution(testtools.TestCase):
+class TestExecution(base.TestCase):
 
     def setUp(self):
         super(TestExecution, self).setUp()
diff --git a/openstack/tests/unit/workflow/test_version.py b/openstack/tests/unit/workflow/test_version.py
index 1aca9a8fb..647418099 100644
--- a/openstack/tests/unit/workflow/test_version.py
+++ b/openstack/tests/unit/workflow/test_version.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.workflow import version
 
@@ -22,7 +22,7 @@ EXAMPLE = {
 }
 
 
-class TestVersion(testtools.TestCase):
+class TestVersion(base.TestCase):
 
     def test_basic(self):
         sot = version.Version()
diff --git a/openstack/tests/unit/workflow/test_workflow.py b/openstack/tests/unit/workflow/test_workflow.py
index c5b2e22a8..b9d457a2a 100644
--- a/openstack/tests/unit/workflow/test_workflow.py
+++ b/openstack/tests/unit/workflow/test_workflow.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.workflow.v2 import workflow
 
@@ -22,7 +22,7 @@ FAKE = {
 }
 
 
-class TestWorkflow(testtools.TestCase):
+class TestWorkflow(base.TestCase):
 
     def setUp(self):
         super(TestWorkflow, self).setUp()
diff --git a/openstack/tests/unit/workflow/test_workflow_service.py b/openstack/tests/unit/workflow/test_workflow_service.py
index cc5dd9b0e..0427672e3 100644
--- a/openstack/tests/unit/workflow/test_workflow_service.py
+++ b/openstack/tests/unit/workflow/test_workflow_service.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import testtools
+from openstack.tests.unit import base
 
 from openstack.workflow import workflow_service
 
 
-class TestWorkflowService(testtools.TestCase):
+class TestWorkflowService(base.TestCase):
 
     def test_service(self):
         sot = workflow_service.WorkflowService()