diff --git a/tests/unit/test_option_types.py b/tests/unit/cli/test_option_types.py
similarity index 100%
rename from tests/unit/test_option_types.py
rename to tests/unit/cli/test_option_types.py
diff --git a/tests/unit/test_macro_resolver.py b/tests/unit/context/test_macro_resolver.py
similarity index 100%
rename from tests/unit/test_macro_resolver.py
rename to tests/unit/context/test_macro_resolver.py
diff --git a/tests/unit/test_manifest.py b/tests/unit/contracts/graph/test_manifest.py
similarity index 99%
rename from tests/unit/test_manifest.py
rename to tests/unit/contracts/graph/test_manifest.py
index e335a09295a..6e24a10d96f 100644
--- a/tests/unit/test_manifest.py
+++ b/tests/unit/contracts/graph/test_manifest.py
@@ -43,7 +43,7 @@
 from dbt.node_types import NodeType
 from dbt_semantic_interfaces.type_enums import MetricType
 
-from .utils import (
+from tests.unit.utils import (
     MockMacro,
     MockDocumentation,
     MockSource,
diff --git a/tests/unit/test_plugin_manager.py b/tests/unit/plugins/test_manager.py
similarity index 100%
rename from tests/unit/test_plugin_manager.py
rename to tests/unit/plugins/test_manager.py
diff --git a/tests/unit/test_retry_commands.py b/tests/unit/task/test_retry.py
similarity index 100%
rename from tests/unit/test_retry_commands.py
rename to tests/unit/task/test_retry.py