diff --git a/ironic/tests/unit/api/v1/__init__.py b/ironic/tests/unit/api/controllers/__init__.py
similarity index 100%
rename from ironic/tests/unit/api/v1/__init__.py
rename to ironic/tests/unit/api/controllers/__init__.py
diff --git a/ironic/tests/unit/api/controllers/v1/__init__.py b/ironic/tests/unit/api/controllers/v1/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ironic/tests/unit/api/v1/test_chassis.py b/ironic/tests/unit/api/controllers/v1/test_chassis.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_chassis.py
rename to ironic/tests/unit/api/controllers/v1/test_chassis.py
diff --git a/ironic/tests/unit/api/v1/test_drivers.py b/ironic/tests/unit/api/controllers/v1/test_driver.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_drivers.py
rename to ironic/tests/unit/api/controllers/v1/test_driver.py
diff --git a/ironic/tests/unit/api/v1/test_expose.py b/ironic/tests/unit/api/controllers/v1/test_expose.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_expose.py
rename to ironic/tests/unit/api/controllers/v1/test_expose.py
diff --git a/ironic/tests/unit/api/v1/test_nodes.py b/ironic/tests/unit/api/controllers/v1/test_node.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_nodes.py
rename to ironic/tests/unit/api/controllers/v1/test_node.py
diff --git a/ironic/tests/unit/api/v1/test_notification_utils.py b/ironic/tests/unit/api/controllers/v1/test_notification_utils.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_notification_utils.py
rename to ironic/tests/unit/api/controllers/v1/test_notification_utils.py
diff --git a/ironic/tests/unit/api/v1/test_ports.py b/ironic/tests/unit/api/controllers/v1/test_port.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_ports.py
rename to ironic/tests/unit/api/controllers/v1/test_port.py
diff --git a/ironic/tests/unit/api/v1/test_portgroups.py b/ironic/tests/unit/api/controllers/v1/test_portgroup.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_portgroups.py
rename to ironic/tests/unit/api/controllers/v1/test_portgroup.py
diff --git a/ironic/tests/unit/api/v1/test_ramdisk.py b/ironic/tests/unit/api/controllers/v1/test_ramdisk.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_ramdisk.py
rename to ironic/tests/unit/api/controllers/v1/test_ramdisk.py
diff --git a/ironic/tests/unit/api/v1/test_root.py b/ironic/tests/unit/api/controllers/v1/test_root.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_root.py
rename to ironic/tests/unit/api/controllers/v1/test_root.py
diff --git a/ironic/tests/unit/api/v1/test_types.py b/ironic/tests/unit/api/controllers/v1/test_types.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_types.py
rename to ironic/tests/unit/api/controllers/v1/test_types.py
diff --git a/ironic/tests/unit/api/v1/test_utils.py b/ironic/tests/unit/api/controllers/v1/test_utils.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_utils.py
rename to ironic/tests/unit/api/controllers/v1/test_utils.py
diff --git a/ironic/tests/unit/api/v1/test_versions.py b/ironic/tests/unit/api/controllers/v1/test_versions.py
similarity index 100%
rename from ironic/tests/unit/api/v1/test_versions.py
rename to ironic/tests/unit/api/controllers/v1/test_versions.py