diff --git a/ironic_inspector/test/unit/__init__.py b/ironic_inspector/test/unit/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ironic_inspector/test/test_common_ironic.py b/ironic_inspector/test/unit/test_common_ironic.py
similarity index 100%
rename from ironic_inspector/test/test_common_ironic.py
rename to ironic_inspector/test/unit/test_common_ironic.py
diff --git a/ironic_inspector/test/test_firewall.py b/ironic_inspector/test/unit/test_firewall.py
similarity index 100%
rename from ironic_inspector/test/test_firewall.py
rename to ironic_inspector/test/unit/test_firewall.py
diff --git a/ironic_inspector/test/test_introspect.py b/ironic_inspector/test/unit/test_introspect.py
similarity index 100%
rename from ironic_inspector/test/test_introspect.py
rename to ironic_inspector/test/unit/test_introspect.py
diff --git a/ironic_inspector/test/test_keystone.py b/ironic_inspector/test/unit/test_keystone.py
similarity index 100%
rename from ironic_inspector/test/test_keystone.py
rename to ironic_inspector/test/unit/test_keystone.py
diff --git a/ironic_inspector/test/test_main.py b/ironic_inspector/test/unit/test_main.py
similarity index 100%
rename from ironic_inspector/test/test_main.py
rename to ironic_inspector/test/unit/test_main.py
diff --git a/ironic_inspector/test/test_migrations.py b/ironic_inspector/test/unit/test_migrations.py
similarity index 100%
rename from ironic_inspector/test/test_migrations.py
rename to ironic_inspector/test/unit/test_migrations.py
diff --git a/ironic_inspector/test/test_node_cache.py b/ironic_inspector/test/unit/test_node_cache.py
similarity index 100%
rename from ironic_inspector/test/test_node_cache.py
rename to ironic_inspector/test/unit/test_node_cache.py
diff --git a/ironic_inspector/test/test_plugins_base.py b/ironic_inspector/test/unit/test_plugins_base.py
similarity index 100%
rename from ironic_inspector/test/test_plugins_base.py
rename to ironic_inspector/test/unit/test_plugins_base.py
diff --git a/ironic_inspector/test/test_plugins_discovery.py b/ironic_inspector/test/unit/test_plugins_discovery.py
similarity index 100%
rename from ironic_inspector/test/test_plugins_discovery.py
rename to ironic_inspector/test/unit/test_plugins_discovery.py
diff --git a/ironic_inspector/test/test_plugins_extra_hardware.py b/ironic_inspector/test/unit/test_plugins_extra_hardware.py
similarity index 100%
rename from ironic_inspector/test/test_plugins_extra_hardware.py
rename to ironic_inspector/test/unit/test_plugins_extra_hardware.py
diff --git a/ironic_inspector/test/test_plugins_raid_device.py b/ironic_inspector/test/unit/test_plugins_raid_device.py
similarity index 100%
rename from ironic_inspector/test/test_plugins_raid_device.py
rename to ironic_inspector/test/unit/test_plugins_raid_device.py
diff --git a/ironic_inspector/test/test_plugins_rules.py b/ironic_inspector/test/unit/test_plugins_rules.py
similarity index 100%
rename from ironic_inspector/test/test_plugins_rules.py
rename to ironic_inspector/test/unit/test_plugins_rules.py
diff --git a/ironic_inspector/test/test_plugins_standard.py b/ironic_inspector/test/unit/test_plugins_standard.py
similarity index 100%
rename from ironic_inspector/test/test_plugins_standard.py
rename to ironic_inspector/test/unit/test_plugins_standard.py
diff --git a/ironic_inspector/test/test_process.py b/ironic_inspector/test/unit/test_process.py
similarity index 100%
rename from ironic_inspector/test/test_process.py
rename to ironic_inspector/test/unit/test_process.py
diff --git a/ironic_inspector/test/test_rules.py b/ironic_inspector/test/unit/test_rules.py
similarity index 100%
rename from ironic_inspector/test/test_rules.py
rename to ironic_inspector/test/unit/test_rules.py
diff --git a/ironic_inspector/test/test_swift.py b/ironic_inspector/test/unit/test_swift.py
similarity index 100%
rename from ironic_inspector/test/test_swift.py
rename to ironic_inspector/test/unit/test_swift.py
diff --git a/ironic_inspector/test/test_utils.py b/ironic_inspector/test/unit/test_utils.py
similarity index 100%
rename from ironic_inspector/test/test_utils.py
rename to ironic_inspector/test/unit/test_utils.py
diff --git a/tox.ini b/tox.ini
index 891c23464..6ca9f2653 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ deps =
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/plugin-requirements.txt
 commands =
-    coverage run --branch --include "ironic_inspector*" -m unittest discover ironic_inspector.test
+    coverage run --branch --include "ironic_inspector*" -m unittest discover ironic_inspector.test.unit
     coverage report -m --fail-under 90
 setenv = PYTHONDONTWRITEBYTECODE=1
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
@@ -21,7 +21,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 
 [testenv:cover]
 commands =
-    coverage run --branch --include "ironic_inspector*" -m unittest discover ironic_inspector.test
+    coverage run --branch --include "ironic_inspector*" -m unittest discover ironic_inspector.test.unit
     coverage report -m
 
 [testenv:pep8]