diff --git a/test/units/parsing/test_data_loader.py b/test/units/parsing/test_dataloader.py
similarity index 100%
rename from test/units/parsing/test_data_loader.py
rename to test/units/parsing/test_dataloader.py
diff --git a/test/units/parsing/test_addresses.py b/test/units/parsing/utils/test_addresses.py
similarity index 100%
rename from test/units/parsing/test_addresses.py
rename to test/units/parsing/utils/test_addresses.py
diff --git a/test/units/plugins/connections/__init__.py b/test/units/playbook/role/__init__.py
similarity index 100%
rename from test/units/plugins/connections/__init__.py
rename to test/units/playbook/role/__init__.py
diff --git a/test/units/playbook/test_role.py b/test/units/playbook/role/test_role.py
similarity index 100%
rename from test/units/playbook/test_role.py
rename to test/units/playbook/role/test_role.py
diff --git a/test/units/plugins/strategies/__init__.py b/test/units/plugins/connection/__init__.py
similarity index 100%
rename from test/units/plugins/strategies/__init__.py
rename to test/units/plugins/connection/__init__.py
diff --git a/test/units/plugins/connections/test_connection.py b/test/units/plugins/connection/test_connection.py
similarity index 100%
rename from test/units/plugins/connections/test_connection.py
rename to test/units/plugins/connection/test_connection.py
diff --git a/test/units/plugins/connections/test_connection_ssh.py b/test/units/plugins/connection/test_ssh.py
similarity index 100%
rename from test/units/plugins/connections/test_connection_ssh.py
rename to test/units/plugins/connection/test_ssh.py
diff --git a/test/units/plugins/strategy/__init__.py b/test/units/plugins/strategy/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/units/plugins/strategies/test_strategy_base.py b/test/units/plugins/strategy/test_strategy_base.py
similarity index 100%
rename from test/units/plugins/strategies/test_strategy_base.py
rename to test/units/plugins/strategy/test_strategy_base.py