diff --git a/nova/tests/unit/api/openstack/compute/test_plugins/basic.py b/nova/tests/unit/api/openstack/compute/basic.py
similarity index 100%
rename from nova/tests/unit/api/openstack/compute/test_plugins/basic.py
rename to nova/tests/unit/api/openstack/compute/basic.py
diff --git a/nova/tests/unit/api/openstack/compute/test_plugins/dummy_schema.py b/nova/tests/unit/api/openstack/compute/dummy_schema.py
similarity index 100%
rename from nova/tests/unit/api/openstack/compute/test_plugins/dummy_schema.py
rename to nova/tests/unit/api/openstack/compute/dummy_schema.py
diff --git a/nova/tests/unit/api/openstack/compute/test_plugins/microversions.py b/nova/tests/unit/api/openstack/compute/microversions.py
similarity index 98%
rename from nova/tests/unit/api/openstack/compute/test_plugins/microversions.py
rename to nova/tests/unit/api/openstack/compute/microversions.py
index 8925382966..89f720d97f 100644
--- a/nova/tests/unit/api/openstack/compute/test_plugins/microversions.py
+++ b/nova/tests/unit/api/openstack/compute/microversions.py
@@ -19,7 +19,7 @@ import webob
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api import validation
-from nova.tests.unit.api.openstack.compute.test_plugins import dummy_schema
+from nova.tests.unit.api.openstack.compute import dummy_schema
 
 ALIAS = 'test-microversions'
 
diff --git a/nova/tests/unit/api/openstack/compute/test_plugins/__init__.py b/nova/tests/unit/api/openstack/compute/test_plugins/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/nova/tests/unit/api/openstack/compute/test_servers.py b/nova/tests/unit/api/openstack/compute/test_serversV21.py
similarity index 99%
rename from nova/tests/unit/api/openstack/compute/test_servers.py
rename to nova/tests/unit/api/openstack/compute/test_serversV21.py
index 360d3dddf8..1fd5b6fd99 100644
--- a/nova/tests/unit/api/openstack/compute/test_servers.py
+++ b/nova/tests/unit/api/openstack/compute/test_serversV21.py
@@ -300,8 +300,8 @@ class ServersControllerTest(ControllerTest):
         self.assertEqual([(None, None, port, None)], res.as_tuples())
 
     def test_requested_networks_neutronv2_subclass_with_port(self):
-        cls = ('nova.tests.unit.api.openstack.compute'
-               '.test_servers.NeutronV2Subclass')
+        cls = ('nova.tests.unit.api.openstack.compute.test_serversV21.'
+               'NeutronV2Subclass')
         self.flags(network_api_class=cls)
         port = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee'
         requested_networks = [{'port': port}]
diff --git a/setup.cfg b/setup.cfg
index ea1be500e5..5791fea713 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -183,8 +183,8 @@ nova.api.v3.extensions.server.resize =
     disk_config = nova.api.openstack.compute.disk_config:DiskConfig
 
 nova.api.v3.test_extensions =
-    basic = nova.tests.unit.api.openstack.compute.test_plugins.basic:Basic
-    microversions = nova.tests.unit.api.openstack.compute.test_plugins.microversions:Microversions
+    basic = nova.tests.unit.api.openstack.compute.basic:Basic
+    microversions = nova.tests.unit.api.openstack.compute.microversions:Microversions
 
 nova.ipv6_backend =
     rfc2462 = nova.ipv6.rfc2462