diff --git a/ec2api/tests/unit/__init__.py b/ec2api/tests/unit/__init__.py
index baa73246..8fe6753b 100644
--- a/ec2api/tests/unit/__init__.py
+++ b/ec2api/tests/unit/__init__.py
@@ -13,10 +13,10 @@
 # limitations under the License.
 
 """
-:mod:`ec2api.tests.unit` -- EC2api Unittests
+:mod:`ec2api.tests.unit.unit` -- EC2api Unittests
 =====================================================
 
-.. automodule:: ec2api.tests.unit
+.. automodule:: ec2api.tests.unit.unit
    :platform: Unix
 """
 
diff --git a/ec2api/tests/base.py b/ec2api/tests/unit/base.py
similarity index 98%
rename from ec2api/tests/base.py
rename to ec2api/tests/unit/base.py
index 49e99e71..80c025fc 100644
--- a/ec2api/tests/base.py
+++ b/ec2api/tests/unit/base.py
@@ -19,9 +19,9 @@ from oslotest import base as test_base
 
 import ec2api.api.apirequest
 from ec2api.api import ec2utils
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 import ec2api.wsgi
 
 
diff --git a/ec2api/tests/fakes.py b/ec2api/tests/unit/fakes.py
similarity index 99%
rename from ec2api/tests/fakes.py
rename to ec2api/tests/unit/fakes.py
index 3435e868..79614554 100644
--- a/ec2api/tests/fakes.py
+++ b/ec2api/tests/unit/fakes.py
@@ -18,7 +18,7 @@ import random
 import uuid
 
 from ec2api.openstack.common import timeutils
-from ec2api.tests import tools
+from ec2api.tests.unit import tools
 
 
 # Helper functions section
diff --git a/ec2api/tests/fakes_request_response.py b/ec2api/tests/unit/fakes_request_response.py
similarity index 99%
rename from ec2api/tests/fakes_request_response.py
rename to ec2api/tests/unit/fakes_request_response.py
index 07890644..d822f65c 100644
--- a/ec2api/tests/fakes_request_response.py
+++ b/ec2api/tests/unit/fakes_request_response.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-from ec2api.tests import tools
+from ec2api.tests.unit import tools
 
 XML_RESULT_TEMPLATE = '''
 <%(action)sResponse
diff --git a/ec2api/tests/matchers.py b/ec2api/tests/unit/matchers.py
similarity index 100%
rename from ec2api/tests/matchers.py
rename to ec2api/tests/unit/matchers.py
diff --git a/ec2api/tests/unit/test_address.py b/ec2api/tests/unit/test_address.py
index 3629c7fd..eeb2d8e0 100644
--- a/ec2api/tests/unit/test_address.py
+++ b/ec2api/tests/unit/test_address.py
@@ -20,10 +20,10 @@ from novaclient import exceptions as nova_exception
 from oslo.config import cfg
 
 from ec2api.api import address
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class AddressTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_api_init.py b/ec2api/tests/unit/test_api_init.py
index bab1a2fd..5564eb11 100644
--- a/ec2api/tests/unit/test_api_init.py
+++ b/ec2api/tests/unit/test_api_init.py
@@ -21,8 +21,8 @@ from oslotest import base as test_base
 from ec2api import api
 from ec2api.api import apirequest
 from ec2api import exception
-from ec2api.tests import fakes_request_response as fakes
-from ec2api.tests import matchers
+from ec2api.tests.unit import fakes_request_response as fakes
+from ec2api.tests.unit import matchers
 from ec2api import wsgi
 
 
diff --git a/ec2api/tests/unit/test_apirequest.py b/ec2api/tests/unit/test_apirequest.py
index e97a8bec..0f7dd7b8 100644
--- a/ec2api/tests/unit/test_apirequest.py
+++ b/ec2api/tests/unit/test_apirequest.py
@@ -21,9 +21,9 @@ from oslo.utils import timeutils
 from oslotest import base as test_base
 
 from ec2api.api import apirequest
-from ec2api.tests import fakes_request_response as fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import fakes_request_response as fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class EC2RequesterTestCase(test_base.BaseTestCase):
diff --git a/ec2api/tests/unit/test_availability_zone.py b/ec2api/tests/unit/test_availability_zone.py
index 7b900f9e..9502640e 100644
--- a/ec2api/tests/unit/test_availability_zone.py
+++ b/ec2api/tests/unit/test_availability_zone.py
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
 
 
 class AvailabilityZoneCase(base.ApiTestCase):
diff --git a/ec2api/tests/test_common.py b/ec2api/tests/unit/test_common.py
similarity index 96%
rename from ec2api/tests/test_common.py
rename to ec2api/tests/unit/test_common.py
index 7df882fa..3a00aefe 100644
--- a/ec2api/tests/test_common.py
+++ b/ec2api/tests/unit/test_common.py
@@ -68,16 +68,16 @@ class OnCrashCleanerTestCase(test_base.BaseTestCase):
 
         self.assertEqual(1, cls.call_count)
         self.assertEqual(3, log.warning.call_count)
-        self.assertIn('ec2api.tests.test_common.FakeCrasherClass.'
+        self.assertIn('ec2api.tests.unit.test_common.FakeCrasherClass.'
                       'fake_crashed_clean_method',
                       log.warning.mock_calls[0][1][0])
         for arg in ["'args'", "666", "{'key': 'value'}",
                     "s='args'", "i=666", "d={'key': 'value'}"]:
             self.assertIn(arg, log.warning.mock_calls[0][1][0])
-        self.assertIn('ec2api.tests.test_common.'
+        self.assertIn('ec2api.tests.unit.test_common.'
                       'fake_standalone_crashed_clean_method',
                       log.warning.mock_calls[1][1][0])
-        self.assertIn('ec2api.tests.test_common.FakeCrasherClass',
+        self.assertIn('ec2api.tests.unit.test_common.FakeCrasherClass',
                       log.warning.mock_calls[2][1][0])
         obj.fake_clean_method.assert_called_once_with('params')
         self.assertFalse(obj.fake_clean_method_25.called)
diff --git a/ec2api/tests/unit/test_db_api.py b/ec2api/tests/unit/test_db_api.py
index 2d335852..caabd364 100644
--- a/ec2api/tests/unit/test_db_api.py
+++ b/ec2api/tests/unit/test_db_api.py
@@ -22,8 +22,8 @@ from ec2api import context as ec2_context
 from ec2api.db import api as db_api
 from ec2api.db import migration
 from ec2api.db.sqlalchemy import api as session
-from ec2api.tests import fakes
-from ec2api.tests import matchers
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
 
 
 class DbApiTestCase(test_base.BaseTestCase):
diff --git a/ec2api/tests/unit/test_dhcp_options.py b/ec2api/tests/unit/test_dhcp_options.py
index 0710a827..f9541ba5 100644
--- a/ec2api/tests/unit/test_dhcp_options.py
+++ b/ec2api/tests/unit/test_dhcp_options.py
@@ -14,10 +14,10 @@
 
 import mock
 
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class DhcpOptionsTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_ec2utils.py b/ec2api/tests/unit/test_ec2utils.py
index c79867a8..3d554101 100644
--- a/ec2api/tests/unit/test_ec2utils.py
+++ b/ec2api/tests/unit/test_ec2utils.py
@@ -18,8 +18,8 @@ import testtools
 
 from ec2api.api import ec2utils
 from ec2api import exception
-from ec2api.tests import fakes
-from ec2api.tests import matchers
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
 
 
 class EC2UtilsTestCase(testtools.TestCase):
diff --git a/ec2api/tests/unit/test_image.py b/ec2api/tests/unit/test_image.py
index d922eeff..d26027ae 100644
--- a/ec2api/tests/unit/test_image.py
+++ b/ec2api/tests/unit/test_image.py
@@ -23,10 +23,10 @@ from oslotest import base as test_base
 
 from ec2api.api import image as image_api
 from ec2api import exception
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 AMI_MANIFEST_XML = """<?xml version="1.0" ?>
diff --git a/ec2api/tests/unit/test_instance.py b/ec2api/tests/unit/test_instance.py
index 1364bed9..d59e7ede 100644
--- a/ec2api/tests/unit/test_instance.py
+++ b/ec2api/tests/unit/test_instance.py
@@ -24,10 +24,10 @@ from oslotest import base as test_base
 
 from ec2api.api import instance as instance_api
 from ec2api import exception
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class InstanceTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_internet_gateway.py b/ec2api/tests/unit/test_internet_gateway.py
index 1acff18c..a38c615f 100644
--- a/ec2api/tests/unit/test_internet_gateway.py
+++ b/ec2api/tests/unit/test_internet_gateway.py
@@ -17,9 +17,9 @@ import mock
 from neutronclient.common import exceptions as neutron_exception
 from oslo.config import cfg
 
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
 
 
 class IgwTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_key_pair.py b/ec2api/tests/unit/test_key_pair.py
index 7a437584..9176538f 100644
--- a/ec2api/tests/unit/test_key_pair.py
+++ b/ec2api/tests/unit/test_key_pair.py
@@ -16,10 +16,10 @@ import base64
 
 from novaclient import exceptions as nova_exception
 
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class KeyPairCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_metadata.py b/ec2api/tests/unit/test_metadata.py
index f8e73705..f8ca3b7c 100644
--- a/ec2api/tests/unit/test_metadata.py
+++ b/ec2api/tests/unit/test_metadata.py
@@ -20,8 +20,8 @@ import webob
 
 from ec2api import exception
 from ec2api import metadata
-from ec2api.tests import fakes
-from ec2api.tests import matchers
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
 
 
 class ProxyTestCase(test_base.BaseTestCase):
diff --git a/ec2api/tests/unit/test_metadata_api.py b/ec2api/tests/unit/test_metadata_api.py
index f391f00a..c2d0f371 100644
--- a/ec2api/tests/unit/test_metadata_api.py
+++ b/ec2api/tests/unit/test_metadata_api.py
@@ -17,9 +17,9 @@ from novaclient import exceptions as nova_exception
 
 from ec2api import exception
 from ec2api.metadata import api
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
 
 
 class MetadataApiTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_network_interface.py b/ec2api/tests/unit/test_network_interface.py
index 86eea728..c7e83c96 100644
--- a/ec2api/tests/unit/test_network_interface.py
+++ b/ec2api/tests/unit/test_network_interface.py
@@ -19,10 +19,10 @@ import mock
 from neutronclient.common import exceptions as neutron_exception
 
 from ec2api.api import ec2utils
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class NetworkInterfaceTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_route_table.py b/ec2api/tests/unit/test_route_table.py
index 3f20f5c7..699fadbd 100644
--- a/ec2api/tests/unit/test_route_table.py
+++ b/ec2api/tests/unit/test_route_table.py
@@ -20,10 +20,10 @@ import mock
 from ec2api.api import common
 from ec2api.api import ec2utils
 from ec2api.api import route_table
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class RouteTableTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_security_group.py b/ec2api/tests/unit/test_security_group.py
index b94927e9..12c72c78 100644
--- a/ec2api/tests/unit/test_security_group.py
+++ b/ec2api/tests/unit/test_security_group.py
@@ -20,10 +20,10 @@ from neutronclient.common import exceptions as neutron_exception
 from novaclient import exceptions as nova_exception
 
 from ec2api.api import security_group
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class SecurityGroupTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_snapshot.py b/ec2api/tests/unit/test_snapshot.py
index 2daa74ca..c9f2b45d 100644
--- a/ec2api/tests/unit/test_snapshot.py
+++ b/ec2api/tests/unit/test_snapshot.py
@@ -14,10 +14,10 @@
 
 import mock
 
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class SnapshotTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_subnet.py b/ec2api/tests/unit/test_subnet.py
index f6c2182a..2bcfb227 100644
--- a/ec2api/tests/unit/test_subnet.py
+++ b/ec2api/tests/unit/test_subnet.py
@@ -15,10 +15,10 @@
 import mock
 from neutronclient.common import exceptions as neutron_exception
 
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class SubnetTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_tag.py b/ec2api/tests/unit/test_tag.py
index 7f5acf72..606a8149 100644
--- a/ec2api/tests/unit/test_tag.py
+++ b/ec2api/tests/unit/test_tag.py
@@ -16,9 +16,9 @@ import mock
 
 from ec2api.api import ec2utils
 from ec2api.api import tag as tag_api
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
 
 
 class TagTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_tools.py b/ec2api/tests/unit/test_tools.py
index b1202ac2..884c5703 100644
--- a/ec2api/tests/unit/test_tools.py
+++ b/ec2api/tests/unit/test_tools.py
@@ -15,7 +15,7 @@
 
 import testtools
 
-from ec2api.tests import tools
+from ec2api.tests.unit import tools
 
 
 class TestToolsTestCase(testtools.TestCase):
diff --git a/ec2api/tests/unit/test_volume.py b/ec2api/tests/unit/test_volume.py
index 5b6d2495..f8fe30a0 100644
--- a/ec2api/tests/unit/test_volume.py
+++ b/ec2api/tests/unit/test_volume.py
@@ -14,10 +14,10 @@
 
 import mock
 
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class VolumeTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/unit/test_vpc.py b/ec2api/tests/unit/test_vpc.py
index 587bc439..5de1d470 100644
--- a/ec2api/tests/unit/test_vpc.py
+++ b/ec2api/tests/unit/test_vpc.py
@@ -16,10 +16,10 @@
 import mock
 from neutronclient.common import exceptions as neutron_exception
 
-from ec2api.tests import base
-from ec2api.tests import fakes
-from ec2api.tests import matchers
-from ec2api.tests import tools
+from ec2api.tests.unit import base
+from ec2api.tests.unit import fakes
+from ec2api.tests.unit import matchers
+from ec2api.tests.unit import tools
 
 
 class VpcTestCase(base.ApiTestCase):
diff --git a/ec2api/tests/tools.py b/ec2api/tests/unit/tools.py
similarity index 100%
rename from ec2api/tests/tools.py
rename to ec2api/tests/unit/tools.py