diff --git a/test/README.md b/test/README.md
index fb541818ae..3ae6c61382 100644
--- a/test/README.md
+++ b/test/README.md
@@ -4,8 +4,8 @@ Ansible Test System
 Folders
 =======
 
-unit
-----
+units
+-----
 
 Unit tests that test small pieces of code not suited for the integration test layer, usually very API based, and should leverage
 mock interfaces rather than producing side effects.
diff --git a/test/integration/target-prefixes.win b/test/integration/target-prefixes.win
new file mode 100644
index 0000000000..58382f8c03
--- /dev/null
+++ b/test/integration/target-prefixes.win
@@ -0,0 +1 @@
+win
diff --git a/test/code-smell/boilerplate.sh b/test/sanity/code-smell/boilerplate.sh
similarity index 100%
rename from test/code-smell/boilerplate.sh
rename to test/sanity/code-smell/boilerplate.sh
diff --git a/test/code-smell/inappropriately-private.sh b/test/sanity/code-smell/inappropriately-private.sh
similarity index 100%
rename from test/code-smell/inappropriately-private.sh
rename to test/sanity/code-smell/inappropriately-private.sh
diff --git a/test/code-smell/no-basestring.sh b/test/sanity/code-smell/no-basestring.sh
similarity index 100%
rename from test/code-smell/no-basestring.sh
rename to test/sanity/code-smell/no-basestring.sh
diff --git a/test/code-smell/replace-urlopen.sh b/test/sanity/code-smell/replace-urlopen.sh
similarity index 100%
rename from test/code-smell/replace-urlopen.sh
rename to test/sanity/code-smell/replace-urlopen.sh
diff --git a/test/code-smell/required-and-default-attributes.sh b/test/sanity/code-smell/required-and-default-attributes.sh
similarity index 100%
rename from test/code-smell/required-and-default-attributes.sh
rename to test/sanity/code-smell/required-and-default-attributes.sh
diff --git a/test/code-smell/use-compat-six.sh b/test/sanity/code-smell/use-compat-six.sh
similarity index 100%
rename from test/code-smell/use-compat-six.sh
rename to test/sanity/code-smell/use-compat-six.sh
diff --git a/test/units/modules/core/cloud/__init__.py b/test/units/modules/core/cloud/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/units/modules/core/cloud/docker/__init__.py b/test/units/modules/core/cloud/docker/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/units/modules/core/test_docker.py b/test/units/modules/core/cloud/docker/test_docker.py
similarity index 100%
rename from test/units/modules/core/test_docker.py
rename to test/units/modules/core/cloud/docker/test_docker.py
diff --git a/test/units/modules/core/packaging/__init__.py b/test/units/modules/core/packaging/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/units/modules/core/packaging/os/__init__.py b/test/units/modules/core/packaging/os/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/units/modules/core/test_apt.py b/test/units/modules/core/packaging/os/test_apt.py
similarity index 100%
rename from test/units/modules/core/test_apt.py
rename to test/units/modules/core/packaging/os/test_apt.py
diff --git a/test/utils/shippable/code-smell.sh b/test/utils/shippable/code-smell.sh
index 97ca8308f5..c544b1015c 100755
--- a/test/utils/shippable/code-smell.sh
+++ b/test/utils/shippable/code-smell.sh
@@ -16,10 +16,10 @@ if [ "${install_deps}" != "" ]; then
 fi
 
 yamllint .
-test/code-smell/replace-urlopen.sh .
-test/code-smell/use-compat-six.sh lib
-test/code-smell/boilerplate.sh
-test/code-smell/required-and-default-attributes.sh
+test/sanity/code-smell/replace-urlopen.sh .
+test/sanity/code-smell/use-compat-six.sh lib
+test/sanity/code-smell/boilerplate.sh
+test/sanity/code-smell/required-and-default-attributes.sh
 
 shellcheck \
     test/integration/targets/*/*.sh \