diff --git a/ironic_tempest_plugin/tests/api/admin/test_allocations.py b/ironic_tempest_plugin/tests/api/admin/test_allocations.py
index 51e8102..f9e2595 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_allocations.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_allocations.py
@@ -16,7 +16,7 @@
 from tempest.lib import exceptions as lib_exc
 
 from ironic_tempest_plugin.common import waiters
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 CONF = config.CONF
 
diff --git a/ironic_tempest_plugin/tests/api/admin/test_api_discovery.py b/ironic_tempest_plugin/tests/api/admin/test_api_discovery.py
index 980ac3c..62def51 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_api_discovery.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_api_discovery.py
@@ -13,7 +13,7 @@
 from tempest.lib import decorators
 
 from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 
 class TestApiDiscovery(base.BaseBaremetalTest):
diff --git a/ironic_tempest_plugin/tests/api/admin/test_chassis.py b/ironic_tempest_plugin/tests/api/admin/test_chassis.py
index 19bdc13..c721471 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_chassis.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_chassis.py
@@ -15,7 +15,7 @@
 from tempest.lib import decorators
 from tempest.lib import exceptions as lib_exc
 
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 
 class TestChassis(base.BaseBaremetalTest):
diff --git a/ironic_tempest_plugin/tests/api/admin/test_conductor.py b/ironic_tempest_plugin/tests/api/admin/test_conductor.py
index ee9f439..c4b31ac 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_conductor.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_conductor.py
@@ -13,7 +13,7 @@
 from tempest import config
 from tempest.lib import decorators
 
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 CONF = config.CONF
 
diff --git a/ironic_tempest_plugin/tests/api/admin/test_deploy_templates.py b/ironic_tempest_plugin/tests/api/admin/test_deploy_templates.py
index 0092a06..17631f8 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_deploy_templates.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_deploy_templates.py
@@ -17,7 +17,7 @@
 from tempest.lib import exceptions as lib_exc
 
 from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 
 EXAMPLE_STEPS = [{
diff --git a/ironic_tempest_plugin/tests/api/admin/test_drivers.py b/ironic_tempest_plugin/tests/api/admin/test_drivers.py
index e80a963..c096d60 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_drivers.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_drivers.py
@@ -16,7 +16,7 @@
 from tempest.lib import decorators
 
 from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 CONF = config.CONF
 
diff --git a/ironic_tempest_plugin/tests/api/admin/test_nodes.py b/ironic_tempest_plugin/tests/api/admin/test_nodes.py
index e4443d9..85c31e0 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_nodes.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_nodes.py
@@ -19,7 +19,7 @@
 
 from ironic_tempest_plugin.common import waiters
 from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 CONF = config.CONF
 
diff --git a/ironic_tempest_plugin/tests/api/admin/test_nodestates.py b/ironic_tempest_plugin/tests/api/admin/test_nodestates.py
index f184b8b..1da978d 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_nodestates.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_nodestates.py
@@ -17,7 +17,7 @@
 from tempest.lib import exceptions
 
 from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 
 class TestNodeStatesMixin(object):
diff --git a/ironic_tempest_plugin/tests/api/admin/test_portgroups.py b/ironic_tempest_plugin/tests/api/admin/test_portgroups.py
index 119bf6c..3e21e41 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_portgroups.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_portgroups.py
@@ -15,7 +15,7 @@
 from tempest.lib import exceptions as lib_exc
 
 from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 
 class TestPortGroups(base.BaseBaremetalTest):
diff --git a/ironic_tempest_plugin/tests/api/admin/test_ports.py b/ironic_tempest_plugin/tests/api/admin/test_ports.py
index 89d86f1..bb6b6f6 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_ports.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_ports.py
@@ -15,7 +15,7 @@
 from tempest.lib import exceptions as lib_exc
 
 from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 
 class TestPorts(base.BaseBaremetalTest):
diff --git a/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py b/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py
index c25020b..bd338f9 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py
@@ -15,7 +15,7 @@
 from tempest.lib import exceptions as lib_exc
 
 from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 
 class TestPortsNegative(base.BaseBaremetalTest):
diff --git a/ironic_tempest_plugin/tests/api/admin/test_volume_connector.py b/ironic_tempest_plugin/tests/api/admin/test_volume_connector.py
index 0be12bf..179c7e3 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_volume_connector.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_volume_connector.py
@@ -18,7 +18,7 @@
 from tempest.lib import exceptions as lib_exc
 
 from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 
 class TestVolumeConnector(base.BaseBaremetalTest):
diff --git a/ironic_tempest_plugin/tests/api/admin/test_volume_target.py b/ironic_tempest_plugin/tests/api/admin/test_volume_target.py
index fa6990f..311c21a 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_volume_target.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_volume_target.py
@@ -18,7 +18,7 @@
 from tempest.lib import exceptions as lib_exc
 
 from ironic_tempest_plugin.tests.api.admin import api_microversion_fixture
-from ironic_tempest_plugin.tests.api.admin import base
+from ironic_tempest_plugin.tests.api import base
 
 
 class TestVolumeTarget(base.BaseBaremetalTest):
diff --git a/ironic_tempest_plugin/tests/api/admin/base.py b/ironic_tempest_plugin/tests/api/base.py
similarity index 100%
rename from ironic_tempest_plugin/tests/api/admin/base.py
rename to ironic_tempest_plugin/tests/api/base.py