225 files changed, 361 insertions, 351 deletions

diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
index ae2f400547..bb5ec4b137 100644
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -1464,16 +1464,16 @@ files:
   docs/docsite/rst/user_guide/windows: *windows_core
 ###############################
 # 'test' is a component path, then 'test' label will be automatically added
-  test/sanity/validate-modules:
+  test/lib/ansible_test/_data/sanity/validate-modules:
     notified:
       - mattclay
     keywords:
       - validate-modules
-  test/sanity/validate-modules/schema.py:
+  test/lib/ansible_test/_data/sanity/validate-modules/schema.py:
     notified:
       - gundalow
       - sivel
-  test/sanity/validate-modules/main.py:
+  test/lib/ansible_test/_data/sanity/validate-modules/main.py:
     notified:
       - gundalow
       - sivel
@@ -1520,9 +1520,9 @@ files:
   test/integration/targets/vultr: *vultr
   test/legacy/:
     notified: mattclay
-  test/runner/:
+  test/lib/:
     notified: mattclay
-  test/runner/lib/cloud/acme.py: *crypto
+  test/lib/ansible_test/_internal/cloud/acme.py: *crypto
   test/sanity/:
     notified: mattclay
   test/units/module_utils/docker/:
diff --git a/MANIFEST.in b/MANIFEST.in
index 137483fa0e..b255249608 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -23,6 +23,6 @@ include MANIFEST.in
 include changelogs/CHANGELOG*.rst
 include contrib/README.md
 recursive-include contrib/inventory *
-exclude test/sanity/code-smell/botmeta.*
+exclude test/lib/ansible_test/_data/sanity/code-smell/botmeta.*
 recursive-include hacking/build_library *.py
 include hacking/build-ansible.py
diff --git a/bin/ansible-test b/bin/ansible-test
index aa1c3da47b..c7ea914c69 100755
--- a/bin/ansible-test
+++ b/bin/ansible-test
@@ -1,15 +1,21 @@
 #!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
-"""Primary entry point for ansible-test."""
+"""Command line entry point for ansible-test."""
 
 from __future__ import (absolute_import, division, print_function)
-
 __metaclass__ = type
 
 import os
 import sys
 
 if __name__ == '__main__':
-    sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'test', 'runner')))
-    import lib.cli
-    lib.cli.main()
+    ansible_root = os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__))))
+    source_root = os.path.join(ansible_root, 'test', 'lib')
+
+    if os.path.exists(os.path.join(ansible_root, 'setup.py')) and os.path.exists(os.path.join(source_root, 'ansible_test', '_internal', 'cli.py')):
+        # running from source, use that version of ansible-test instead of any version that may already be installed
+        sys.path.insert(0, source_root)
+
+    from ansible_test._internal.cli import main
+
+    main()
diff --git a/docs/docsite/rst/dev_guide/testing/sanity/update-bundled.rst b/docs/docsite/rst/dev_guide/testing/sanity/update-bundled.rst
index d8f19385b3..de255a0142 100644
--- a/docs/docsite/rst/dev_guide/testing/sanity/update-bundled.rst
+++ b/docs/docsite/rst/dev_guide/testing/sanity/update-bundled.rst
@@ -15,7 +15,7 @@ This test can error in the following ways:
   added, this error should go away.
 
 * A file has a _BUNDLED_METADATA variable but the file isn't specified in
-  :file:`test/sanity/code-smell/update-bundled.py`.  This typically happens when a new bundled
+  :file:`test/lib/ansible_test/_data/sanity/code-smell/update-bundled.py`.  This typically happens when a new bundled
   library is added.  Add the file to the `get_bundled_libs()` function in the `update-bundled.py`
   test script to solve this error.
 
diff --git a/docs/docsite/rst/dev_guide/testing_validate-modules.rst b/docs/docsite/rst/dev_guide/testing_validate-modules.rst
index 6e22b66b3b..28709f51df 100644
--- a/docs/docsite/rst/dev_guide/testing_validate-modules.rst
+++ b/docs/docsite/rst/dev_guide/testing_validate-modules.rst
@@ -52,7 +52,7 @@ Help
 Extending validate-modules
 ==========================
 
-The ``validate-modules`` tool has a `schema.py <https://github.com/ansible/ansible/blob/devel/test/sanity/validate-modules/schema.py>`_ that is used to validate the YAML blocks, such as ``DOCUMENTATION`` and ``RETURNS``.
+The ``validate-modules`` tool has a `schema.py <https://github.com/ansible/ansible/blob/devel/test/lib/ansible_test/_data/sanity/validate-modules/schema.py>`_ that is used to validate the YAML blocks, such as ``DOCUMENTATION`` and ``RETURNS``.
 
 
 Codes
diff --git a/hacking/report.py b/hacking/report.py
index 47f64e7984..ae4b3fb96d 100755
--- a/hacking/report.py
+++ b/hacking/report.py
@@ -13,7 +13,7 @@ import sys
 DATABASE_PATH = os.path.expanduser('~/.ansible/report.db')
 BASE_PATH = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..')) + '/'
 ANSIBLE_PATH = os.path.join(BASE_PATH, 'lib')
-ANSIBLE_TEST_PATH = os.path.join(BASE_PATH, 'test/runner')
+ANSIBLE_TEST_PATH = os.path.join(BASE_PATH, 'test/lib')
 
 if ANSIBLE_PATH not in sys.path:
     sys.path.insert(0, ANSIBLE_PATH)
@@ -24,7 +24,7 @@ if ANSIBLE_TEST_PATH not in sys.path:
 from ansible.module_utils.urls import open_url
 from ansible.parsing.metadata import extract_metadata
 
-from lib.target import walk_integration_targets
+from ansible_test._internal.target import walk_integration_targets
 
 
 def main():
diff --git a/test/integration/targets/lookup_hashi_vault/aliases b/test/integration/targets/lookup_hashi_vault/aliases
index ca01009e65..e75e146f97 100644
--- a/test/integration/targets/lookup_hashi_vault/aliases
+++ b/test/integration/targets/lookup_hashi_vault/aliases
@@ -1,4 +1,4 @@
 shippable/posix/group2
 destructive
 needs/target/setup_openssl
-needs/file/test/runner/requirements/constraints.txt
+needs/file/test/lib/ansible_test/_data/requirements/constraints.txt
diff --git a/test/integration/targets/lookup_hashi_vault/playbooks/install_dependencies.yml b/test/integration/targets/lookup_hashi_vault/playbooks/install_dependencies.yml
index 30e2d02df0..adf6cb3d7f 100644
--- a/test/integration/targets/lookup_hashi_vault/playbooks/install_dependencies.yml
+++ b/test/integration/targets/lookup_hashi_vault/playbooks/install_dependencies.yml
@@ -17,4 +17,4 @@
     - name: 'Install hvac Python package'
       pip:
         name: "{{ hvac_package|default('hvac') }}"
-        extra_args: "-c {{ playbook_dir }}/../../../../runner/requirements/constraints.txt"
+        extra_args: "-c {{ playbook_dir }}/../../../../lib/ansible_test/_data/requirements/constraints.txt"
diff --git a/test/integration/targets/setup_remote_constraints/aliases b/test/integration/targets/setup_remote_constraints/aliases
index f50acb2d6a..18cc100a5e 100644
--- a/test/integration/targets/setup_remote_constraints/aliases
+++ b/test/integration/targets/setup_remote_constraints/aliases
@@ -1 +1 @@
-needs/file/test/runner/requirements/constraints.txt
+needs/file/test/lib/ansible_test/_data/requirements/constraints.txt
diff --git a/test/integration/targets/setup_remote_constraints/tasks/main.yml b/test/integration/targets/setup_remote_constraints/tasks/main.yml
index 9827267dfc..eee09ccf64 100644
--- a/test/integration/targets/setup_remote_constraints/tasks/main.yml
+++ b/test/integration/targets/setup_remote_constraints/tasks/main.yml
@@ -4,5 +4,5 @@
 
 - name: copy constraints.txt to remote host
   copy:
-    src: "{{ role_path }}/../../../runner/requirements/constraints.txt"
+    src: "{{ role_path }}/../../../lib/ansible_test/_data/requirements/constraints.txt"
     dest: "{{ remote_constraints }}"
diff --git a/test/env/ansible.cfg b/test/lib/ansible_test/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/test/env/ansible.cfg
+++ b/test/lib/ansible_test/__init__.py
diff --git a/test/runner/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt
index 7ae70c9044..7ae70c9044 100644
--- a/test/runner/completion/docker.txt
+++ b/test/lib/ansible_test/_data/completion/docker.txt
diff --git a/test/runner/completion/network.txt b/test/lib/ansible_test/_data/completion/network.txt
index 502388338a..502388338a 100644
--- a/test/runner/completion/network.txt
+++ b/test/lib/ansible_test/_data/completion/network.txt
diff --git a/test/runner/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt
index 6263cf70ca..6263cf70ca 100644
--- a/test/runner/completion/remote.txt
+++ b/test/lib/ansible_test/_data/completion/remote.txt
diff --git a/test/runner/completion/windows.txt b/test/lib/ansible_test/_data/completion/windows.txt
index a4f3bf589b..a4f3bf589b 100644
--- a/test/runner/completion/windows.txt
+++ b/test/lib/ansible_test/_data/completion/windows.txt
diff --git a/test/sanity/ansible.cfg b/test/lib/ansible_test/_data/env/ansible.cfg
index e69de29bb2..e69de29bb2 100644
--- a/test/sanity/ansible.cfg
+++ b/test/lib/ansible_test/_data/env/ansible.cfg
diff --git a/test/runner/injector/ansible b/test/lib/ansible_test/_data/injector/ansible
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/ansible
+++ b/test/lib/ansible_test/_data/injector/ansible
diff --git a/test/runner/injector/ansible-config b/test/lib/ansible_test/_data/injector/ansible-config
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/ansible-config
+++ b/test/lib/ansible_test/_data/injector/ansible-config
diff --git a/test/runner/injector/ansible-connection b/test/lib/ansible_test/_data/injector/ansible-connection
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/ansible-connection
+++ b/test/lib/ansible_test/_data/injector/ansible-connection
diff --git a/test/runner/injector/ansible-console b/test/lib/ansible_test/_data/injector/ansible-console
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/ansible-console
+++ b/test/lib/ansible_test/_data/injector/ansible-console
diff --git a/test/runner/injector/ansible-doc b/test/lib/ansible_test/_data/injector/ansible-doc
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/ansible-doc
+++ b/test/lib/ansible_test/_data/injector/ansible-doc
diff --git a/test/runner/injector/ansible-galaxy b/test/lib/ansible_test/_data/injector/ansible-galaxy
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/ansible-galaxy
+++ b/test/lib/ansible_test/_data/injector/ansible-galaxy
diff --git a/test/runner/injector/ansible-inventory b/test/lib/ansible_test/_data/injector/ansible-inventory
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/ansible-inventory
+++ b/test/lib/ansible_test/_data/injector/ansible-inventory
diff --git a/test/runner/injector/ansible-playbook b/test/lib/ansible_test/_data/injector/ansible-playbook
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/ansible-playbook
+++ b/test/lib/ansible_test/_data/injector/ansible-playbook
diff --git a/test/runner/injector/ansible-pull b/test/lib/ansible_test/_data/injector/ansible-pull
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/ansible-pull
+++ b/test/lib/ansible_test/_data/injector/ansible-pull
diff --git a/test/runner/injector/ansible-vault b/test/lib/ansible_test/_data/injector/ansible-vault
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/ansible-vault
+++ b/test/lib/ansible_test/_data/injector/ansible-vault
diff --git a/test/runner/injector/importer.py b/test/lib/ansible_test/_data/injector/importer.py
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/importer.py
+++ b/test/lib/ansible_test/_data/injector/importer.py
diff --git a/test/runner/injector/pytest b/test/lib/ansible_test/_data/injector/pytest
index 6bbbfe4d91..6bbbfe4d91 120000
--- a/test/runner/injector/pytest
+++ b/test/lib/ansible_test/_data/injector/pytest
diff --git a/test/runner/injector/python.py b/test/lib/ansible_test/_data/injector/python.py
index 4819880511..4819880511 100755
--- a/test/runner/injector/python.py
+++ b/test/lib/ansible_test/_data/injector/python.py
diff --git a/test/runner/injector/virtualenv-isolated.sh b/test/lib/ansible_test/_data/injector/virtualenv-isolated.sh
index 82f799809e..82f799809e 100644
--- a/test/runner/injector/virtualenv-isolated.sh
+++ b/test/lib/ansible_test/_data/injector/virtualenv-isolated.sh
diff --git a/test/runner/injector/virtualenv.sh b/test/lib/ansible_test/_data/injector/virtualenv.sh
index ccde29748c..ccde29748c 100644
--- a/test/runner/injector/virtualenv.sh
+++ b/test/lib/ansible_test/_data/injector/virtualenv.sh
diff --git a/test/runner/pytest.ini b/test/lib/ansible_test/_data/pytest.ini
index 6426f2d4d7..6426f2d4d7 100644
--- a/test/runner/pytest.ini
+++ b/test/lib/ansible_test/_data/pytest.ini
diff --git a/test/units/pytest/plugins/ansible_pytest_collections.py b/test/lib/ansible_test/_data/pytest/plugins/ansible_pytest_collections.py
index ae87187b83..ae87187b83 100644
--- a/test/units/pytest/plugins/ansible_pytest_collections.py
+++ b/test/lib/ansible_test/_data/pytest/plugins/ansible_pytest_collections.py
diff --git a/test/units/pytest/plugins/ansible_pytest_coverage.py b/test/lib/ansible_test/_data/pytest/plugins/ansible_pytest_coverage.py
index 344a091e1c..344a091e1c 100644
--- a/test/units/pytest/plugins/ansible_pytest_coverage.py
+++ b/test/lib/ansible_test/_data/pytest/plugins/ansible_pytest_coverage.py
diff --git a/test/runner/requirements/ansible-test.txt b/test/lib/ansible_test/_data/requirements/ansible-test.txt
index d08d921a32..d08d921a32 100644
--- a/test/runner/requirements/ansible-test.txt
+++ b/test/lib/ansible_test/_data/requirements/ansible-test.txt
diff --git a/test/runner/requirements/constraints.txt b/test/lib/ansible_test/_data/requirements/constraints.txt
index 31ae95e7c7..31ae95e7c7 100644
--- a/test/runner/requirements/constraints.txt
+++ b/test/lib/ansible_test/_data/requirements/constraints.txt
diff --git a/test/runner/requirements/coverage.txt b/test/lib/ansible_test/_data/requirements/coverage.txt
index 4ebc8aea50..4ebc8aea50 100644
--- a/test/runner/requirements/coverage.txt
+++ b/test/lib/ansible_test/_data/requirements/coverage.txt
diff --git a/test/runner/requirements/integration.cloud.aws.txt b/test/lib/ansible_test/_data/requirements/integration.cloud.aws.txt
index aa2f71cc3e..aa2f71cc3e 100644
--- a/test/runner/requirements/integration.cloud.aws.txt
+++ b/test/lib/ansible_test/_data/requirements/integration.cloud.aws.txt
diff --git a/test/runner/requirements/integration.cloud.azure.txt b/test/lib/ansible_test/_data/requirements/integration.cloud.azure.txt
index 8be65d203d..8be65d203d 100644
--- a/test/runner/requirements/integration.cloud.azure.txt
+++ b/test/lib/ansible_test/_data/requirements/integration.cloud.azure.txt
diff --git a/test/runner/requirements/integration.cloud.cs.txt b/test/lib/ansible_test/_data/requirements/integration.cloud.cs.txt
index f0a89b9126..f0a89b9126 100644
--- a/test/runner/requirements/integration.cloud.cs.txt
+++ b/test/lib/ansible_test/_data/requirements/integration.cloud.cs.txt
diff --git a/test/runner/requirements/integration.cloud.hcloud.txt b/test/lib/ansible_test/_data/requirements/integration.cloud.hcloud.txt
index 97ffca61fa..97ffca61fa 100644
--- a/test/runner/requirements/integration.cloud.hcloud.txt
+++ b/test/lib/ansible_test/_data/requirements/integration.cloud.hcloud.txt
diff --git a/test/runner/requirements/integration.cloud.nios.txt b/test/lib/ansible_test/_data/requirements/integration.cloud.nios.txt
index be61145433..be61145433 100644
--- a/test/runner/requirements/integration.cloud.nios.txt
+++ b/test/lib/ansible_test/_data/requirements/integration.cloud.nios.txt
diff --git a/test/runner/requirements/integration.cloud.opennebula.txt b/test/lib/ansible_test/_data/requirements/integration.cloud.opennebula.txt
index acd346682c..acd346682c 100644
--- a/test/runner/requirements/integration.cloud.opennebula.txt
+++ b/test/lib/ansible_test/_data/requirements/integration.cloud.opennebula.txt
diff --git a/test/runner/requirements/integration.cloud.openshift.txt b/test/lib/ansible_test/_data/requirements/integration.cloud.openshift.txt
index 269bf090c7..269bf090c7 100644
--- a/test/runner/requirements/integration.cloud.openshift.txt
+++ b/test/lib/ansible_test/_data/requirements/integration.cloud.openshift.txt
diff --git a/test/runner/requirements/integration.cloud.vcenter.txt b/test/lib/ansible_test/_data/requirements/integration.cloud.vcenter.txt
index 6f750903ca..6f750903ca 100644
--- a/test/runner/requirements/integration.cloud.vcenter.txt
+++ b/test/lib/ansible_test/_data/requirements/integration.cloud.vcenter.txt
diff --git a/test/runner/requirements/integration.txt b/test/lib/ansible_test/_data/requirements/integration.txt
index 469d21f998..469d21f998 100644
--- a/test/runner/requirements/integration.txt
+++ b/test/lib/ansible_test/_data/requirements/integration.txt
diff --git a/test/runner/requirements/network-integration.txt b/test/lib/ansible_test/_data/requirements/network-integration.txt
index 0ced7858b9..0ced7858b9 100644
--- a/test/runner/requirements/network-integration.txt
+++ b/test/lib/ansible_test/_data/requirements/network-integration.txt
diff --git a/test/runner/requirements/sanity.ps1 b/test/lib/ansible_test/_data/requirements/sanity.ps1
index 53d14a3418..53d14a3418 100755
--- a/test/runner/requirements/sanity.ps1
+++ b/test/lib/ansible_test/_data/requirements/sanity.ps1
diff --git a/test/runner/requirements/sanity.txt b/test/lib/ansible_test/_data/requirements/sanity.txt
index 1545e8f99b..1545e8f99b 100644
--- a/test/runner/requirements/sanity.txt
+++ b/test/lib/ansible_test/_data/requirements/sanity.txt
diff --git a/test/runner/requirements/units.txt b/test/lib/ansible_test/_data/requirements/units.txt
index b198cbebcf..b198cbebcf 100644
--- a/test/runner/requirements/units.txt
+++ b/test/lib/ansible_test/_data/requirements/units.txt
diff --git a/test/runner/requirements/windows-integration.txt b/test/lib/ansible_test/_data/requirements/windows-integration.txt
index 089add5e3d..089add5e3d 100644
--- a/test/runner/requirements/windows-integration.txt
+++ b/test/lib/ansible_test/_data/requirements/windows-integration.txt
diff --git a/test/units/ansible.cfg b/test/lib/ansible_test/_data/sanity/ansible.cfg
index e69de29bb2..e69de29bb2 100644
--- a/test/units/ansible.cfg
+++ b/test/lib/ansible_test/_data/sanity/ansible.cfg
diff --git a/test/sanity/code-smell/action-plugin-docs.json b/test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.json
index 6ff1c681f9..6ff1c681f9 100644
--- a/test/sanity/code-smell/action-plugin-docs.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.json
diff --git a/test/sanity/code-smell/action-plugin-docs.py b/test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py
index e2a195685a..e2a195685a 100755
--- a/test/sanity/code-smell/action-plugin-docs.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py
diff --git a/test/sanity/code-smell/ansible-only.txt b/test/lib/ansible_test/_data/sanity/code-smell/ansible-only.txt
index 14c45f0799..14c45f0799 100644
--- a/test/sanity/code-smell/ansible-only.txt
+++ b/test/lib/ansible_test/_data/sanity/code-smell/ansible-only.txt
diff --git a/test/sanity/code-smell/azure-requirements.json b/test/lib/ansible_test/_data/sanity/code-smell/azure-requirements.json
index 593b765d14..593b765d14 100644
--- a/test/sanity/code-smell/azure-requirements.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/azure-requirements.json
diff --git a/test/sanity/code-smell/azure-requirements.py b/test/lib/ansible_test/_data/sanity/code-smell/azure-requirements.py
index 1c71b67a70..cef84f2062 100755
--- a/test/sanity/code-smell/azure-requirements.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/azure-requirements.py
@@ -9,7 +9,7 @@ import os
 
 def main():
     src = 'packaging/requirements/requirements-azure.txt'
-    dst = 'test/runner/requirements/integration.cloud.azure.txt'
+    dst = 'test/lib/ansible_test/_data/requirements/integration.cloud.azure.txt'
 
     missing = [p for p in [src, dst] if not os.path.isfile(p)]
 
diff --git a/test/sanity/code-smell/botmeta.json b/test/lib/ansible_test/_data/sanity/code-smell/botmeta.json
index 56455d209b..56455d209b 100644
--- a/test/sanity/code-smell/botmeta.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/botmeta.json
diff --git a/test/sanity/code-smell/botmeta.py b/test/lib/ansible_test/_data/sanity/code-smell/botmeta.py
index 2e930e8f1c..2e930e8f1c 100755
--- a/test/sanity/code-smell/botmeta.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/botmeta.py
diff --git a/test/sanity/code-smell/changelog.json b/test/lib/ansible_test/_data/sanity/code-smell/changelog.json
index afad9a05dc..afad9a05dc 100644
--- a/test/sanity/code-smell/changelog.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/changelog.json
diff --git a/test/sanity/code-smell/changelog.py b/test/lib/ansible_test/_data/sanity/code-smell/changelog.py
index 31123e5b29..31123e5b29 100755
--- a/test/sanity/code-smell/changelog.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/changelog.py
diff --git a/test/sanity/code-smell/configure-remoting-ps1.json b/test/lib/ansible_test/_data/sanity/code-smell/configure-remoting-ps1.json
index 593b765d14..593b765d14 100644
--- a/test/sanity/code-smell/configure-remoting-ps1.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/configure-remoting-ps1.json
diff --git a/test/sanity/code-smell/configure-remoting-ps1.py b/test/lib/ansible_test/_data/sanity/code-smell/configure-remoting-ps1.py
index 7bf26bcf10..7bf26bcf10 100755
--- a/test/sanity/code-smell/configure-remoting-ps1.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/configure-remoting-ps1.py
diff --git a/test/sanity/code-smell/deprecated-config.json b/test/lib/ansible_test/_data/sanity/code-smell/deprecated-config.json
index 4a88486066..4a88486066 100644
--- a/test/sanity/code-smell/deprecated-config.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/deprecated-config.json
diff --git a/test/sanity/code-smell/deprecated-config.py b/test/lib/ansible_test/_data/sanity/code-smell/deprecated-config.py
index 08e93c3659..08e93c3659 100755
--- a/test/sanity/code-smell/deprecated-config.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/deprecated-config.py
diff --git a/test/sanity/code-smell/docs-build.json b/test/lib/ansible_test/_data/sanity/code-smell/docs-build.json
index a43fa923b2..a43fa923b2 100644
--- a/test/sanity/code-smell/docs-build.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/docs-build.json
diff --git a/test/sanity/code-smell/docs-build.py b/test/lib/ansible_test/_data/sanity/code-smell/docs-build.py
index 4fe99de02e..4fe99de02e 100755
--- a/test/sanity/code-smell/docs-build.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/docs-build.py
diff --git a/test/sanity/code-smell/empty-init.json b/test/lib/ansible_test/_data/sanity/code-smell/empty-init.json
index 88487ae089..88487ae089 100644
--- a/test/sanity/code-smell/empty-init.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/empty-init.json
diff --git a/test/sanity/code-smell/empty-init.py b/test/lib/ansible_test/_data/sanity/code-smell/empty-init.py
index 8bcd7f9ed9..8bcd7f9ed9 100755
--- a/test/sanity/code-smell/empty-init.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/empty-init.py
diff --git a/test/sanity/code-smell/future-import-boilerplate.json b/test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.json
index 6f1edb783c..6f1edb783c 100644
--- a/test/sanity/code-smell/future-import-boilerplate.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.json
diff --git a/test/sanity/code-smell/future-import-boilerplate.py b/test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.py
index 373fd4d6f2..373fd4d6f2 100755
--- a/test/sanity/code-smell/future-import-boilerplate.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.py
diff --git a/test/sanity/code-smell/line-endings.json b/test/lib/ansible_test/_data/sanity/code-smell/line-endings.json
index db5c3c9809..db5c3c9809 100644
--- a/test/sanity/code-smell/line-endings.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/line-endings.json
diff --git a/test/sanity/code-smell/line-endings.py b/test/lib/ansible_test/_data/sanity/code-smell/line-endings.py
index 1e4212d1b8..1e4212d1b8 100755
--- a/test/sanity/code-smell/line-endings.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/line-endings.py
diff --git a/test/sanity/code-smell/metaclass-boilerplate.json b/test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.json
index 6f1edb783c..6f1edb783c 100644
--- a/test/sanity/code-smell/metaclass-boilerplate.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.json
diff --git a/test/sanity/code-smell/metaclass-boilerplate.py b/test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py
index cc211a3617..cc211a3617 100755
--- a/test/sanity/code-smell/metaclass-boilerplate.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py
diff --git a/test/sanity/code-smell/no-assert.json b/test/lib/ansible_test/_data/sanity/code-smell/no-assert.json
index 779b3d07bb..779b3d07bb 100644
--- a/test/sanity/code-smell/no-assert.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-assert.json
diff --git a/test/sanity/code-smell/no-assert.py b/test/lib/ansible_test/_data/sanity/code-smell/no-assert.py
index 78561d966e..78561d966e 100755
--- a/test/sanity/code-smell/no-assert.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-assert.py
diff --git a/test/sanity/code-smell/no-basestring.json b/test/lib/ansible_test/_data/sanity/code-smell/no-basestring.json
index 88858aeb61..88858aeb61 100644
--- a/test/sanity/code-smell/no-basestring.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-basestring.json
diff --git a/test/sanity/code-smell/no-basestring.py b/test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py
index a35650efad..a35650efad 100755
--- a/test/sanity/code-smell/no-basestring.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py
diff --git a/test/sanity/code-smell/no-dict-iteritems.json b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.json
index 88858aeb61..88858aeb61 100644
--- a/test/sanity/code-smell/no-dict-iteritems.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.json
diff --git a/test/sanity/code-smell/no-dict-iteritems.py b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py
index e28b24f4a9..e28b24f4a9 100755
--- a/test/sanity/code-smell/no-dict-iteritems.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py
diff --git a/test/sanity/code-smell/no-dict-iterkeys.json b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.json
index 88858aeb61..88858aeb61 100644
--- a/test/sanity/code-smell/no-dict-iterkeys.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.json
diff --git a/test/sanity/code-smell/no-dict-iterkeys.py b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py
index 237ee5b1c1..237ee5b1c1 100755
--- a/test/sanity/code-smell/no-dict-iterkeys.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py
diff --git a/test/sanity/code-smell/no-dict-itervalues.json b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.json
index 88858aeb61..88858aeb61 100644
--- a/test/sanity/code-smell/no-dict-itervalues.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.json
diff --git a/test/sanity/code-smell/no-dict-itervalues.py b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py
index 4bf92ea990..4bf92ea990 100755
--- a/test/sanity/code-smell/no-dict-itervalues.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py
diff --git a/test/sanity/code-smell/no-get-exception.json b/test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.json
index 88858aeb61..88858aeb61 100644
--- a/test/sanity/code-smell/no-get-exception.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.json
diff --git a/test/sanity/code-smell/no-get-exception.py b/test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.py
index c925f5b729..c925f5b729 100755
--- a/test/sanity/code-smell/no-get-exception.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.py
diff --git a/test/sanity/code-smell/no-illegal-filenames.json b/test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.json
index cc4333bff5..cc4333bff5 100644
--- a/test/sanity/code-smell/no-illegal-filenames.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.json
diff --git a/test/sanity/code-smell/no-illegal-filenames.py b/test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.py
index 99432ea133..99432ea133 100755
--- a/test/sanity/code-smell/no-illegal-filenames.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.py
diff --git a/test/sanity/code-smell/no-main-display.json b/test/lib/ansible_test/_data/sanity/code-smell/no-main-display.json
index 779b3d07bb..779b3d07bb 100644
--- a/test/sanity/code-smell/no-main-display.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-main-display.json
diff --git a/test/sanity/code-smell/no-main-display.py b/test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py
index 74a36ecc58..74a36ecc58 100755
--- a/test/sanity/code-smell/no-main-display.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py
diff --git a/test/sanity/code-smell/no-smart-quotes.json b/test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.json
index 54d9fff587..54d9fff587 100644
--- a/test/sanity/code-smell/no-smart-quotes.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.json
diff --git a/test/sanity/code-smell/no-smart-quotes.py b/test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.py
index e44005a55f..e44005a55f 100755
--- a/test/sanity/code-smell/no-smart-quotes.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.py
diff --git a/test/sanity/code-smell/no-unicode-literals.json b/test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.json
index 88858aeb61..88858aeb61 100644
--- a/test/sanity/code-smell/no-unicode-literals.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.json
diff --git a/test/sanity/code-smell/no-unicode-literals.py b/test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.py
index e2201ab106..e2201ab106 100755
--- a/test/sanity/code-smell/no-unicode-literals.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.py
diff --git a/test/sanity/code-smell/no-unwanted-files.json b/test/lib/ansible_test/_data/sanity/code-smell/no-unwanted-files.json
index f508e3e18e..f508e3e18e 100644
--- a/test/sanity/code-smell/no-unwanted-files.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-unwanted-files.json
diff --git a/test/sanity/code-smell/no-unwanted-files.py b/test/lib/ansible_test/_data/sanity/code-smell/no-unwanted-files.py
index 197ae60331..197ae60331 100755
--- a/test/sanity/code-smell/no-unwanted-files.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/no-unwanted-files.py
diff --git a/test/sanity/code-smell/package-data.json b/test/lib/ansible_test/_data/sanity/code-smell/package-data.json
index 22b0a15da7..22b0a15da7 100644
--- a/test/sanity/code-smell/package-data.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/package-data.json
diff --git a/test/sanity/code-smell/package-data.py b/test/lib/ansible_test/_data/sanity/code-smell/package-data.py
index 6b59d9702d..6b59d9702d 100755
--- a/test/sanity/code-smell/package-data.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/package-data.py
diff --git a/test/sanity/code-smell/replace-urlopen.json b/test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.json
index 88858aeb61..88858aeb61 100644
--- a/test/sanity/code-smell/replace-urlopen.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.json
diff --git a/test/sanity/code-smell/replace-urlopen.py b/test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py
index b2de1ba85d..b2de1ba85d 100755
--- a/test/sanity/code-smell/replace-urlopen.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py
diff --git a/test/sanity/code-smell/required-and-default-attributes.json b/test/lib/ansible_test/_data/sanity/code-smell/required-and-default-attributes.json
index dd9ac7b1f9..dd9ac7b1f9 100644
--- a/test/sanity/code-smell/required-and-default-attributes.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/required-and-default-attributes.json
diff --git a/test/sanity/code-smell/required-and-default-attributes.py b/test/lib/ansible_test/_data/sanity/code-smell/required-and-default-attributes.py
index 5ef410bd04..5ef410bd04 100755
--- a/test/sanity/code-smell/required-and-default-attributes.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/required-and-default-attributes.py
diff --git a/test/sanity/code-smell/shebang.json b/test/lib/ansible_test/_data/sanity/code-smell/shebang.json
index 5648429eb0..5648429eb0 100644
--- a/test/sanity/code-smell/shebang.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/shebang.json
diff --git a/test/sanity/code-smell/shebang.py b/test/lib/ansible_test/_data/sanity/code-smell/shebang.py
index 02be695b71..0c2de08cd9 100755
--- a/test/sanity/code-smell/shebang.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/shebang.py
@@ -64,7 +64,9 @@ def main():
 
             if path.startswith('lib/ansible/modules/'):
                 is_module = True
-            elif path.startswith('lib/') or path.startswith('test/runner/lib/'):
+            elif path.startswith('test/lib/ansible_test/_data/'):
+                pass
+            elif path.startswith('lib/') or path.startswith('test/lib/'):
                 if executable:
                     print('%s:%d:%d: should not be executable' % (path, 0, 0))
 
diff --git a/test/sanity/code-smell/skip.txt b/test/lib/ansible_test/_data/sanity/code-smell/skip.txt
index 6fb327b3b0..6fb327b3b0 100644
--- a/test/sanity/code-smell/skip.txt
+++ b/test/lib/ansible_test/_data/sanity/code-smell/skip.txt
diff --git a/test/sanity/code-smell/symlinks.json b/test/lib/ansible_test/_data/sanity/code-smell/symlinks.json
index 593b765d14..593b765d14 100644
--- a/test/sanity/code-smell/symlinks.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/symlinks.json
diff --git a/test/sanity/code-smell/symlinks.py b/test/lib/ansible_test/_data/sanity/code-smell/symlinks.py
index 3f54759ba9..3f54759ba9 100755
--- a/test/sanity/code-smell/symlinks.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/symlinks.py
diff --git a/test/sanity/code-smell/test-constraints.json b/test/lib/ansible_test/_data/sanity/code-smell/test-constraints.json
index 2ddf53c65f..69b07bf3bb 100644
--- a/test/sanity/code-smell/test-constraints.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/test-constraints.json
@@ -1,6 +1,6 @@
 {
     "prefixes": [
-        "test/runner/requirements/"
+        "test/lib/ansible_test/_data/requirements/"
     ],
     "extensions": [
         ".txt"
diff --git a/test/sanity/code-smell/test-constraints.py b/test/lib/ansible_test/_data/sanity/code-smell/test-constraints.py
index 82749bd99a..e8b9c7952a 100755
--- a/test/sanity/code-smell/test-constraints.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/test-constraints.py
@@ -13,7 +13,7 @@ def main():
                 match = re.search(r'^[^;#]*?([<>=])(?!.*sanity_ok.*)', text)
 
                 if match:
-                    print('%s:%d:%d: put constraints in `test/runner/requirements/constraints.txt`' % (
+                    print('%s:%d:%d: put constraints in `test/lib/ansible_test/_data/requirements/constraints.txt`' % (
                         path, line + 1, match.start(1) + 1))
 
 
diff --git a/test/sanity/code-smell/update-bundled.json b/test/lib/ansible_test/_data/sanity/code-smell/update-bundled.json
index 379bf4d7b4..379bf4d7b4 100644
--- a/test/sanity/code-smell/update-bundled.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/update-bundled.json
diff --git a/test/sanity/code-smell/update-bundled.py b/test/lib/ansible_test/_data/sanity/code-smell/update-bundled.py
index 121e225f39..3720e2f08b 100755
--- a/test/sanity/code-smell/update-bundled.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/update-bundled.py
@@ -132,7 +132,7 @@ def main():
 
     for filename in files_with_bundled_metadata.difference(bundled_libs):
         print('{0}: ERROR: File contains _BUNDLED_METADATA but needs to be added to'
-              ' test/sanity/code-smell/update-bundled.py'.format(filename))
+              ' test/lib/ansible_test/_data/sanity/code-smell/update-bundled.py'.format(filename))
 
     for filename in bundled_libs:
         try:
diff --git a/test/sanity/code-smell/use-argspec-type-path.json b/test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.json
index aa531d39e7..aa531d39e7 100644
--- a/test/sanity/code-smell/use-argspec-type-path.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.json
diff --git a/test/sanity/code-smell/use-argspec-type-path.py b/test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py
index 687136dcdb..687136dcdb 100755
--- a/test/sanity/code-smell/use-argspec-type-path.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py
diff --git a/test/sanity/code-smell/use-compat-six.json b/test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.json
index 776590b74d..776590b74d 100644
--- a/test/sanity/code-smell/use-compat-six.json
+++ b/test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.json
diff --git a/test/sanity/code-smell/use-compat-six.py b/test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py
index 49cb76c5e2..49cb76c5e2 100755
--- a/test/sanity/code-smell/use-compat-six.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py
diff --git a/test/sanity/compile/compile.py b/test/lib/ansible_test/_data/sanity/compile/compile.py
index 3a2a0ddb23..3a2a0ddb23 100755
--- a/test/sanity/compile/compile.py
+++ b/test/lib/ansible_test/_data/sanity/compile/compile.py
diff --git a/test/sanity/import/importer.py b/test/lib/ansible_test/_data/sanity/import/importer.py
index 719341cb67..e0606950b6 100755
--- a/test/sanity/import/importer.py
+++ b/test/lib/ansible_test/_data/sanity/import/importer.py
@@ -135,7 +135,7 @@ def main():
             else:
                 for result in results:
                     if result[0].startswith(filter_dir):
-                        source = result[0][len(base_dir) + 1:].replace('test/sanity/import/', '')
+                        source = result[0][len(base_dir) + 1:].replace('test/lib/ansible_test/_data/sanity/import/', '')
                         line = result[1] or 0
                         break
 
diff --git a/test/sanity/pep8/current-ignore.txt b/test/lib/ansible_test/_data/sanity/pep8/current-ignore.txt
index 659c7f59e7..659c7f59e7 100644
--- a/test/sanity/pep8/current-ignore.txt
+++ b/test/lib/ansible_test/_data/sanity/pep8/current-ignore.txt
diff --git a/test/sanity/pslint/pslint.ps1 b/test/lib/ansible_test/_data/sanity/pslint/pslint.ps1
index 1ef2743acd..1ef2743acd 100755
--- a/test/sanity/pslint/pslint.ps1
+++ b/test/lib/ansible_test/_data/sanity/pslint/pslint.ps1
diff --git a/test/sanity/pslint/settings.psd1 b/test/lib/ansible_test/_data/sanity/pslint/settings.psd1
index 7646ec35e1..7646ec35e1 100644
--- a/test/sanity/pslint/settings.psd1
+++ b/test/lib/ansible_test/_data/sanity/pslint/settings.psd1
diff --git a/test/sanity/pylint/config/ansible-test b/test/lib/ansible_test/_data/sanity/pylint/config/ansible-test
index 96a19bb8d6..96a19bb8d6 100644
--- a/test/sanity/pylint/config/ansible-test
+++ b/test/lib/ansible_test/_data/sanity/pylint/config/ansible-test
diff --git a/test/sanity/pylint/config/collection b/test/lib/ansible_test/_data/sanity/pylint/config/collection
index 6af0b7dab0..6af0b7dab0 100644
--- a/test/sanity/pylint/config/collection
+++ b/test/lib/ansible_test/_data/sanity/pylint/config/collection
diff --git a/test/sanity/pylint/config/default b/test/lib/ansible_test/_data/sanity/pylint/config/default
index ee84cede0c..ee84cede0c 100644
--- a/test/sanity/pylint/config/default
+++ b/test/lib/ansible_test/_data/sanity/pylint/config/default
diff --git a/test/sanity/pylint/config/sanity b/test/lib/ansible_test/_data/sanity/pylint/config/sanity
index 7ecf0820ad..7ecf0820ad 100644
--- a/test/sanity/pylint/config/sanity
+++ b/test/lib/ansible_test/_data/sanity/pylint/config/sanity
diff --git a/test/sanity/pylint/plugins/blacklist.py b/test/lib/ansible_test/_data/sanity/pylint/plugins/blacklist.py
index bc0571cd44..bc0571cd44 100644
--- a/test/sanity/pylint/plugins/blacklist.py
+++ b/test/lib/ansible_test/_data/sanity/pylint/plugins/blacklist.py
diff --git a/test/sanity/pylint/plugins/deprecated.py b/test/lib/ansible_test/_data/sanity/pylint/plugins/deprecated.py
index dafd912e84..dafd912e84 100644
--- a/test/sanity/pylint/plugins/deprecated.py
+++ b/test/lib/ansible_test/_data/sanity/pylint/plugins/deprecated.py
diff --git a/test/sanity/pylint/plugins/string_format.py b/test/lib/ansible_test/_data/sanity/pylint/plugins/string_format.py
index 4437b078b8..4437b078b8 100644
--- a/test/sanity/pylint/plugins/string_format.py
+++ b/test/lib/ansible_test/_data/sanity/pylint/plugins/string_format.py
diff --git a/test/sanity/rstcheck/ignore-substitutions.txt b/test/lib/ansible_test/_data/sanity/rstcheck/ignore-substitutions.txt
index 393fcfb2f4..393fcfb2f4 100644
--- a/test/sanity/rstcheck/ignore-substitutions.txt
+++ b/test/lib/ansible_test/_data/sanity/rstcheck/ignore-substitutions.txt
diff --git a/test/sanity/shellcheck/exclude.txt b/test/lib/ansible_test/_data/sanity/shellcheck/exclude.txt
index b06ec7adbc..b06ec7adbc 100644
--- a/test/sanity/shellcheck/exclude.txt
+++ b/test/lib/ansible_test/_data/sanity/shellcheck/exclude.txt
diff --git a/test/sanity/validate-modules/__init__.py b/test/lib/ansible_test/_data/sanity/validate-modules/__init__.py
index d8ff2dc0d4..d8ff2dc0d4 100644
--- a/test/sanity/validate-modules/__init__.py
+++ b/test/lib/ansible_test/_data/sanity/validate-modules/__init__.py
diff --git a/test/sanity/validate-modules/main.py b/test/lib/ansible_test/_data/sanity/validate-modules/main.py
index febf389bcb..febf389bcb 100755
--- a/test/sanity/validate-modules/main.py
+++ b/test/lib/ansible_test/_data/sanity/validate-modules/main.py
diff --git a/test/sanity/validate-modules/module_args.py b/test/lib/ansible_test/_data/sanity/validate-modules/module_args.py
index 50e9416bf8..50e9416bf8 100644
--- a/test/sanity/validate-modules/module_args.py
+++ b/test/lib/ansible_test/_data/sanity/validate-modules/module_args.py
diff --git a/test/sanity/validate-modules/ps_argspec.ps1 b/test/lib/ansible_test/_data/sanity/validate-modules/ps_argspec.ps1
index 35b918c569..35b918c569 100755
--- a/test/sanity/validate-modules/ps_argspec.ps1
+++ b/test/lib/ansible_test/_data/sanity/validate-modules/ps_argspec.ps1
diff --git a/test/sanity/validate-modules/schema.py b/test/lib/ansible_test/_data/sanity/validate-modules/schema.py
index 426bbdfe60..426bbdfe60 100644
--- a/test/sanity/validate-modules/schema.py
+++ b/test/lib/ansible_test/_data/sanity/validate-modules/schema.py
diff --git a/test/sanity/validate-modules/test_validate_modules_regex.py b/test/lib/ansible_test/_data/sanity/validate-modules/test_validate_modules_regex.py
index aebe3cd322..aebe3cd322 100644
--- a/test/sanity/validate-modules/test_validate_modules_regex.py
+++ b/test/lib/ansible_test/_data/sanity/validate-modules/test_validate_modules_regex.py
diff --git a/test/sanity/validate-modules/utils.py b/test/lib/ansible_test/_data/sanity/validate-modules/utils.py
index 3a08349713..3a08349713 100644
--- a/test/sanity/validate-modules/utils.py
+++ b/test/lib/ansible_test/_data/sanity/validate-modules/utils.py
diff --git a/test/sanity/validate-modules/validate-modules b/test/lib/ansible_test/_data/sanity/validate-modules/validate-modules
index 11a5d8e18a..11a5d8e18a 120000
--- a/test/sanity/validate-modules/validate-modules
+++ b/test/lib/ansible_test/_data/sanity/validate-modules/validate-modules
diff --git a/test/sanity/yamllint/config/default.yml b/test/lib/ansible_test/_data/sanity/yamllint/config/default.yml
index 45d8b7adcf..45d8b7adcf 100644
--- a/test/sanity/yamllint/config/default.yml
+++ b/test/lib/ansible_test/_data/sanity/yamllint/config/default.yml
diff --git a/test/sanity/yamllint/config/modules.yml b/test/lib/ansible_test/_data/sanity/yamllint/config/modules.yml
index da7e604999..da7e604999 100644
--- a/test/sanity/yamllint/config/modules.yml
+++ b/test/lib/ansible_test/_data/sanity/yamllint/config/modules.yml
diff --git a/test/sanity/yamllint/config/plugins.yml b/test/lib/ansible_test/_data/sanity/yamllint/config/plugins.yml
index 6d41813787..6d41813787 100644
--- a/test/sanity/yamllint/config/plugins.yml
+++ b/test/lib/ansible_test/_data/sanity/yamllint/config/plugins.yml
diff --git a/test/sanity/yamllint/yamllinter.py b/test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py
index efde78a6d0..efde78a6d0 100755
--- a/test/sanity/yamllint/yamllinter.py
+++ b/test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py
diff --git a/test/runner/setup/docker.sh b/test/lib/ansible_test/_data/setup/docker.sh
index c65e8ac5fc..c65e8ac5fc 100644
--- a/test/runner/setup/docker.sh
+++ b/test/lib/ansible_test/_data/setup/docker.sh
diff --git a/test/runner/setup/remote.sh b/test/lib/ansible_test/_data/setup/remote.sh
index 7955259458..7955259458 100644
--- a/test/runner/setup/remote.sh
+++ b/test/lib/ansible_test/_data/setup/remote.sh
diff --git a/test/runner/setup/windows-httptester.ps1 b/test/lib/ansible_test/_data/setup/windows-httptester.ps1
index 70bdb33229..70bdb33229 100644
--- a/test/runner/setup/windows-httptester.ps1
+++ b/test/lib/ansible_test/_data/setup/windows-httptester.ps1
diff --git a/test/runner/tox.ini b/test/lib/ansible_test/_data/tox.ini
index cd2533fd22..cd2533fd22 100644
--- a/test/runner/tox.ini
+++ b/test/lib/ansible_test/_data/tox.ini
diff --git a/test/lib/ansible_test/_data/units/ansible.cfg b/test/lib/ansible_test/_data/units/ansible.cfg
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/lib/ansible_test/_data/units/ansible.cfg
diff --git a/test/runner/versions.py b/test/lib/ansible_test/_data/versions.py
index 06729720ed..06729720ed 100755
--- a/test/runner/versions.py
+++ b/test/lib/ansible_test/_data/versions.py
diff --git a/test/runner/yamlcheck.py b/test/lib/ansible_test/_data/yamlcheck.py
index 591842f4ad..591842f4ad 100755
--- a/test/runner/yamlcheck.py
+++ b/test/lib/ansible_test/_data/yamlcheck.py
diff --git a/test/runner/lib/__init__.py b/test/lib/ansible_test/_internal/__init__.py
index 35f044224c..35f044224c 100644
--- a/test/runner/lib/__init__.py
+++ b/test/lib/ansible_test/_internal/__init__.py
diff --git a/test/runner/lib/ansible_util.py b/test/lib/ansible_test/_internal/ansible_util.py
index 126b41b14f..e36829e1dc 100644
--- a/test/runner/lib/ansible_util.py
+++ b/test/lib/ansible_test/_internal/ansible_util.py
@@ -5,11 +5,11 @@ __metaclass__ = type
 import json
 import os
 
-from lib.constants import (
+from .constants import (
     SOFT_RLIMIT_NOFILE,
 )
 
-from lib.util import (
+from .util import (
     common_environment,
     display,
     find_python,
@@ -18,16 +18,16 @@ from lib.util import (
     ANSIBLE_TEST_DATA_ROOT,
 )
 
-from lib.util_common import (
+from .util_common import (
     run_command,
 )
 
-from lib.config import (
+from .config import (
     IntegrationConfig,
     EnvironmentConfig,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
@@ -54,7 +54,7 @@ def ansible_environment(args, color=True, ansible_config=None):
     elif isinstance(args, IntegrationConfig):
         ansible_config = os.path.join(ANSIBLE_ROOT, 'test/integration/%s.cfg' % args.command)
     else:
-        ansible_config = os.path.join(ANSIBLE_ROOT, 'test/%s/ansible.cfg' % args.command)
+        ansible_config = os.path.join(ANSIBLE_TEST_DATA_ROOT, '%s/ansible.cfg' % args.command)
 
     if not args.explain and not os.path.exists(ansible_config):
         raise ApplicationError('Configuration not found: %s' % ansible_config)
diff --git a/test/runner/lib/cache.py b/test/lib/ansible_test/_internal/cache.py
index 85fdbb1f1b..85fdbb1f1b 100644
--- a/test/runner/lib/cache.py
+++ b/test/lib/ansible_test/_internal/cache.py
diff --git a/test/runner/lib/changes.py b/test/lib/ansible_test/_internal/changes.py
index 4dd50500f2..1c5d85a5d7 100644
--- a/test/runner/lib/changes.py
+++ b/test/lib/ansible_test/_internal/changes.py
@@ -5,23 +5,23 @@ __metaclass__ = type
 import re
 import os
 
-from lib.util import (
+from .util import (
     ApplicationError,
     SubprocessError,
     MissingEnvironmentVariable,
     display,
 )
 
-from lib.util_common import (
+from .util_common import (
     CommonConfig,
 )
 
-from lib.http import (
+from .http import (
     HttpClient,
     urlencode,
 )
 
-from lib.git import (
+from .git import (
     Git,
 )
 
diff --git a/test/runner/lib/classification.py b/test/lib/ansible_test/_internal/classification.py
index 97bc8116bf..5a458713d0 100644
--- a/test/runner/lib/classification.py
+++ b/test/lib/ansible_test/_internal/classification.py
@@ -7,7 +7,7 @@ import os
 import re
 import time
 
-from lib.target import (
+from .target import (
     walk_module_targets,
     walk_integration_targets,
     walk_units_targets,
@@ -17,36 +17,36 @@ from lib.target import (
     analyze_integration_target_dependencies,
 )
 
-from lib.util import (
+from .util import (
     display,
     is_subdir,
 )
 
-from lib.import_analysis import (
+from .import_analysis import (
     get_python_module_utils_imports,
     get_python_module_utils_name,
 )
 
-from lib.csharp_import_analysis import (
+from .csharp_import_analysis import (
     get_csharp_module_utils_imports,
     get_csharp_module_utils_name,
 )
 
-from lib.powershell_import_analysis import (
+from .powershell_import_analysis import (
     get_powershell_module_utils_imports,
     get_powershell_module_utils_name,
 )
 
-from lib.config import (
+from .config import (
     TestConfig,
     IntegrationConfig,
 )
 
-from lib.metadata import (
+from .metadata import (
     ChangeDescription,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
@@ -723,11 +723,11 @@ class PathMapper:
 
                 test_path = os.path.dirname(test_path)
 
-        if path.startswith('test/runner/completion/'):
-            if path == 'test/runner/completion/docker.txt':
+        if path.startswith('test/lib/ansible_test/_data/completion/'):
+            if path == 'test/lib/ansible_test/_data/completion/docker.txt':
                 return all_tests(self.args, force=True)  # force all tests due to risk of breaking changes in new test environment
 
-        if path.startswith('test/runner/lib/cloud/'):
+        if path.startswith('test/lib/ansible_test/_internal/cloud/'):
             cloud_target = 'cloud/%s/' % name
 
             if cloud_target in self.integration_targets_by_alias:
@@ -737,12 +737,12 @@ class PathMapper:
 
             return all_tests(self.args)  # test infrastructure, run all tests
 
-        if path.startswith('test/runner/lib/sanity/'):
+        if path.startswith('test/lib/ansible_test/_internal/sanity/'):
             return {
                 'sanity': 'all',  # test infrastructure, run all sanity checks
             }
 
-        if path.startswith('test/runner/requirements/'):
+        if path.startswith('test/lib/ansible_test/_data/requirements/'):
             if name in (
                     'integration',
                     'network-integration',
@@ -768,7 +768,7 @@ class PathMapper:
                         'integration': cloud_target,
                     }
 
-        if path.startswith('test/runner/'):
+        if path.startswith('test/lib/'):
             return all_tests(self.args)  # test infrastructure, run all tests
 
         if path.startswith('test/utils/shippable/tools/'):
diff --git a/test/runner/lib/cli.py b/test/lib/ansible_test/_internal/cli.py
index 64f86c0cdd..9cd2b53b3f 100644
--- a/test/runner/lib/cli.py
+++ b/test/lib/ansible_test/_internal/cli.py
@@ -8,11 +8,11 @@ import sys
 
 # This import should occur as early as possible.
 # It must occur before subprocess has been imported anywhere in the current process.
-from lib.init import (
+from .init import (
     CURRENT_RLIMIT_NOFILE,
 )
 
-from lib.util import (
+from .util import (
     ApplicationError,
     display,
     raw_command,
@@ -24,12 +24,12 @@ from lib.util import (
     ANSIBLE_TEST_DATA_ROOT,
 )
 
-from lib.delegation import (
+from .delegation import (
     check_delegation_args,
     delegate,
 )
 
-from lib.executor import (
+from .executor import (
     command_posix_integration,
     command_network_integration,
     command_windows_integration,
@@ -42,7 +42,7 @@ from lib.executor import (
     check_startup,
 )
 
-from lib.config import (
+from .config import (
     IntegrationConfig,
     PosixIntegrationConfig,
     WindowsIntegrationConfig,
@@ -52,19 +52,19 @@ from lib.config import (
     ShellConfig,
 )
 
-from lib.env import (
+from .env import (
     EnvConfig,
     command_env,
     configure_timeout,
 )
 
-from lib.sanity import (
+from .sanity import (
     command_sanity,
     sanity_init,
     sanity_get_tests,
 )
 
-from lib.target import (
+from .target import (
     find_target_completion,
     walk_posix_integration_targets,
     walk_network_integration_targets,
@@ -73,23 +73,23 @@ from lib.target import (
     walk_sanity_targets,
 )
 
-from lib.core_ci import (
+from .core_ci import (
     AWS_ENDPOINTS,
 )
 
-from lib.cloud import (
+from .cloud import (
     initialize_cloud_plugins,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
-from lib.util_common import (
+from .util_common import (
     CommonConfig,
 )
 
-from lib.cover import (
+from .cover import (
     command_coverage_combine,
     command_coverage_erase,
     command_coverage_html,
diff --git a/test/runner/lib/cloud/__init__.py b/test/lib/ansible_test/_internal/cloud/__init__.py
index 232a70d428..b7ef15731a 100644
--- a/test/runner/lib/cloud/__init__.py
+++ b/test/lib/ansible_test/_internal/cloud/__init__.py
@@ -13,9 +13,9 @@ import random
 import re
 import tempfile
 
-import lib.types as t
+from .. import types as t
 
-from lib.util import (
+from ..util import (
     ApplicationError,
     display,
     is_shippable,
@@ -26,15 +26,15 @@ from lib.util import (
     make_dirs,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.config import (
+from ..config import (
     IntegrationConfig,
 )
 
-from lib.data import (
+from ..data import (
     data_context,
 )
 
@@ -183,7 +183,7 @@ class CloudBase(ABC):
         :type args: IntegrationConfig
         """
         self.args = args
-        self.platform = self.__module__.split('.')[2]
+        self.platform = self.__module__.split('.')[-1]
 
         def config_callback(files):  # type: (t.List[t.Tuple[str, str]]) -> None
             """Add the config file to the payload file list."""
diff --git a/test/runner/lib/cloud/acme.py b/test/lib/ansible_test/_internal/cloud/acme.py
index 0d200faa27..770dc307da 100644
--- a/test/runner/lib/cloud/acme.py
+++ b/test/lib/ansible_test/_internal/cloud/acme.py
@@ -5,24 +5,24 @@ __metaclass__ = type
 import os
 import time
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.util import (
+from ..util import (
     find_executable,
     display,
     ApplicationError,
     SubprocessError,
 )
 
-from lib.http import (
+from ..http import (
     HttpClient,
 )
 
-from lib.docker_util import (
+from ..docker_util import (
     docker_run,
     docker_rm,
     docker_inspect,
diff --git a/test/runner/lib/cloud/aws.py b/test/lib/ansible_test/_internal/cloud/aws.py
index 948415bd90..e2032d5dae 100644
--- a/test/runner/lib/cloud/aws.py
+++ b/test/lib/ansible_test/_internal/cloud/aws.py
@@ -4,20 +4,20 @@ __metaclass__ = type
 
 import os
 
-from lib.util import (
+from ..util import (
     ApplicationError,
     display,
     is_shippable,
     ConfigParser,
 )
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.core_ci import (
+from ..core_ci import (
     AnsibleCoreCI,
 )
 
diff --git a/test/runner/lib/cloud/azure.py b/test/lib/ansible_test/_internal/cloud/azure.py
index b1930097e2..e022a83e3d 100644
--- a/test/runner/lib/cloud/azure.py
+++ b/test/lib/ansible_test/_internal/cloud/azure.py
@@ -4,27 +4,27 @@ __metaclass__ = type
 
 import os
 
-from lib.util import (
+from ..util import (
     ApplicationError,
     display,
     is_shippable,
     ConfigParser,
 )
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.http import (
+from ..http import (
     HttpClient,
     urlparse,
     urlunparse,
     parse_qs,
 )
 
-from lib.core_ci import (
+from ..core_ci import (
     AnsibleCoreCI,
 )
 
diff --git a/test/runner/lib/cloud/cloudscale.py b/test/lib/ansible_test/_internal/cloud/cloudscale.py
index 60b3c9d3f4..098bdb7c8c 100644
--- a/test/runner/lib/cloud/cloudscale.py
+++ b/test/lib/ansible_test/_internal/cloud/cloudscale.py
@@ -9,13 +9,13 @@ __metaclass__ = type
 
 from os.path import isfile
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.util import ConfigParser, display
+from ..util import ConfigParser, display
 
 
 class CloudscaleCloudProvider(CloudProvider):
diff --git a/test/runner/lib/cloud/cs.py b/test/lib/ansible_test/_internal/cloud/cs.py
index a5cbe5d8f3..0bf5f51569 100644
--- a/test/runner/lib/cloud/cs.py
+++ b/test/lib/ansible_test/_internal/cloud/cs.py
@@ -7,13 +7,13 @@ import os
 import re
 import time
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.util import (
+from ..util import (
     find_executable,
     ApplicationError,
     display,
@@ -22,13 +22,13 @@ from lib.util import (
     ConfigParser,
 )
 
-from lib.http import (
+from ..http import (
     HttpClient,
     HttpError,
     urlparse,
 )
 
-from lib.docker_util import (
+from ..docker_util import (
     docker_run,
     docker_rm,
     docker_inspect,
diff --git a/test/runner/lib/cloud/foreman.py b/test/lib/ansible_test/_internal/cloud/foreman.py
index b421c4fd07..b421c4fd07 100644
--- a/test/runner/lib/cloud/foreman.py
+++ b/test/lib/ansible_test/_internal/cloud/foreman.py
diff --git a/test/runner/lib/cloud/gcp.py b/test/lib/ansible_test/_internal/cloud/gcp.py
index 9b56e54e22..c8de18357c 100644
--- a/test/runner/lib/cloud/gcp.py
+++ b/test/lib/ansible_test/_internal/cloud/gcp.py
@@ -6,12 +6,12 @@ __metaclass__ = type
 
 import os
 
-from lib.util import (
+from ..util import (
     display,
     ConfigParser,
 )
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
diff --git a/test/runner/lib/cloud/hcloud.py b/test/lib/ansible_test/_internal/cloud/hcloud.py
index 29a437b7ce..fa068597b0 100644
--- a/test/runner/lib/cloud/hcloud.py
+++ b/test/lib/ansible_test/_internal/cloud/hcloud.py
@@ -4,19 +4,19 @@ __metaclass__ = type
 
 import os
 
-from lib.util import (
+from ..util import (
     display,
     is_shippable,
     ConfigParser,
 )
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.core_ci import (
+from ..core_ci import (
     AnsibleCoreCI,
 )
 
diff --git a/test/runner/lib/cloud/nios.py b/test/lib/ansible_test/_internal/cloud/nios.py
index 91456ae501..91456ae501 100644
--- a/test/runner/lib/cloud/nios.py
+++ b/test/lib/ansible_test/_internal/cloud/nios.py
diff --git a/test/runner/lib/cloud/opennebula.py b/test/lib/ansible_test/_internal/cloud/opennebula.py
index 0ffaac5d0d..d0757279d0 100644
--- a/test/runner/lib/cloud/opennebula.py
+++ b/test/lib/ansible_test/_internal/cloud/opennebula.py
@@ -2,13 +2,13 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.util import (
+from ..util import (
     display,
     ConfigParser,
 )
diff --git a/test/runner/lib/cloud/openshift.py b/test/lib/ansible_test/_internal/cloud/openshift.py
index eedc764c17..15d90cd1ad 100644
--- a/test/runner/lib/cloud/openshift.py
+++ b/test/lib/ansible_test/_internal/cloud/openshift.py
@@ -7,24 +7,24 @@ import os
 import re
 import time
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.util import (
+from ..util import (
     find_executable,
     ApplicationError,
     display,
     SubprocessError,
 )
 
-from lib.http import (
+from ..http import (
     HttpClient,
 )
 
-from lib.docker_util import (
+from ..docker_util import (
     docker_exec,
     docker_run,
     docker_rm,
diff --git a/test/runner/lib/cloud/scaleway.py b/test/lib/ansible_test/_internal/cloud/scaleway.py
index 3dcba47dfe..f52f8f0e45 100644
--- a/test/runner/lib/cloud/scaleway.py
+++ b/test/lib/ansible_test/_internal/cloud/scaleway.py
@@ -4,13 +4,13 @@ __metaclass__ = type
 
 import os
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.util import ConfigParser
+from ..util import ConfigParser
 
 
 class ScalewayCloudProvider(CloudProvider):
diff --git a/test/runner/lib/cloud/tower.py b/test/lib/ansible_test/_internal/cloud/tower.py
index 2c34a06538..a0f98612fa 100644
--- a/test/runner/lib/cloud/tower.py
+++ b/test/lib/ansible_test/_internal/cloud/tower.py
@@ -5,7 +5,7 @@ __metaclass__ = type
 import os
 import time
 
-from lib.util import (
+from ..util import (
     display,
     ApplicationError,
     is_shippable,
@@ -13,17 +13,17 @@ from lib.util import (
     ConfigParser,
 )
 
-from lib.util_common import (
+from ..util_common import (
     run_command,
 )
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.core_ci import (
+from ..core_ci import (
     AnsibleCoreCI,
 )
 
diff --git a/test/runner/lib/cloud/vcenter.py b/test/lib/ansible_test/_internal/cloud/vcenter.py
index c12368d047..40947b9a05 100644
--- a/test/runner/lib/cloud/vcenter.py
+++ b/test/lib/ansible_test/_internal/cloud/vcenter.py
@@ -5,13 +5,13 @@ __metaclass__ = type
 import os
 import time
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.util import (
+from ..util import (
     find_executable,
     display,
     ApplicationError,
@@ -20,7 +20,7 @@ from lib.util import (
     SubprocessError,
 )
 
-from lib.docker_util import (
+from ..docker_util import (
     docker_run,
     docker_rm,
     docker_inspect,
@@ -28,11 +28,11 @@ from lib.docker_util import (
     get_docker_container_id,
 )
 
-from lib.core_ci import (
+from ..core_ci import (
     AnsibleCoreCI,
 )
 
-from lib.http import (
+from ..http import (
     HttpClient,
 )
 
diff --git a/test/runner/lib/cloud/vultr.py b/test/lib/ansible_test/_internal/cloud/vultr.py
index a47a60431a..3ff2b98cec 100644
--- a/test/runner/lib/cloud/vultr.py
+++ b/test/lib/ansible_test/_internal/cloud/vultr.py
@@ -4,13 +4,13 @@ __metaclass__ = type
 
 import os
 
-from lib.cloud import (
+from . import (
     CloudProvider,
     CloudEnvironment,
     CloudEnvironmentConfig,
 )
 
-from lib.util import ConfigParser
+from ..util import ConfigParser
 
 
 class VultrCloudProvider(CloudProvider):
diff --git a/test/runner/lib/config.py b/test/lib/ansible_test/_internal/config.py
index 7d22e51e67..5d1dfa254f 100644
--- a/test/runner/lib/config.py
+++ b/test/lib/ansible_test/_internal/config.py
@@ -5,9 +5,9 @@ __metaclass__ = type
 import os
 import sys
 
-import lib.types as t
+from . import types as t
 
-from lib.util import (
+from .util import (
     is_shippable,
     docker_qualify_image,
     find_python,
@@ -16,15 +16,15 @@ from lib.util import (
     ApplicationError,
 )
 
-from lib.util_common import (
+from .util_common import (
     CommonConfig,
 )
 
-from lib.metadata import (
+from .metadata import (
     Metadata,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
diff --git a/test/runner/lib/constants.py b/test/lib/ansible_test/_internal/constants.py
index f4307822a1..f4307822a1 100644
--- a/test/runner/lib/constants.py
+++ b/test/lib/ansible_test/_internal/constants.py
diff --git a/test/runner/lib/core_ci.py b/test/lib/ansible_test/_internal/core_ci.py
index 46270ad0ab..47178e6102 100644
--- a/test/runner/lib/core_ci.py
+++ b/test/lib/ansible_test/_internal/core_ci.py
@@ -9,15 +9,15 @@ import uuid
 import errno
 import time
 
-import lib.types as t
+from . import types as t
 
-from lib.http import (
+from .http import (
     HttpClient,
     HttpResponse,
     HttpError,
 )
 
-from lib.util import (
+from .util import (
     ApplicationError,
     make_dirs,
     display,
@@ -25,15 +25,15 @@ from lib.util import (
     to_text,
 )
 
-from lib.util_common import (
+from .util_common import (
     run_command,
 )
 
-from lib.config import (
+from .config import (
     EnvironmentConfig,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
diff --git a/test/runner/lib/cover.py b/test/lib/ansible_test/_internal/cover.py
index af04ac5232..a768a9d93b 100644
--- a/test/runner/lib/cover.py
+++ b/test/lib/ansible_test/_internal/cover.py
@@ -5,32 +5,32 @@ __metaclass__ = type
 import os
 import re
 
-from lib.target import (
+from .target import (
     walk_module_targets,
     walk_compile_targets,
 )
 
-from lib.util import (
+from .util import (
     display,
     ApplicationError,
     common_environment,
 )
 
-from lib.util_common import (
+from .util_common import (
     run_command,
 )
 
-from lib.config import (
+from .config import (
     CoverageConfig,
     CoverageReportConfig,
 )
 
-from lib.executor import (
+from .executor import (
     Delegate,
     install_command_requirements,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
diff --git a/test/runner/lib/coverage_util.py b/test/lib/ansible_test/_internal/coverage_util.py
index c106665c82..d44bf5bafb 100644
--- a/test/runner/lib/coverage_util.py
+++ b/test/lib/ansible_test/_internal/coverage_util.py
@@ -6,18 +6,18 @@ import contextlib
 import os
 import tempfile
 
-from lib.config import (
+from .config import (
     IntegrationConfig,
     SanityConfig,
     TestConfig,
 )
 
-from lib.util import (
+from .util import (
     COVERAGE_CONFIG_PATH,
     remove_tree,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
diff --git a/test/runner/lib/csharp_import_analysis.py b/test/lib/ansible_test/_internal/csharp_import_analysis.py
index b23ae66096..185a72dcb5 100644
--- a/test/runner/lib/csharp_import_analysis.py
+++ b/test/lib/ansible_test/_internal/csharp_import_analysis.py
@@ -5,11 +5,11 @@ __metaclass__ = type
 import os
 import re
 
-from lib.util import (
+from .util import (
     display,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
diff --git a/test/runner/lib/data.py b/test/lib/ansible_test/_internal/data.py
index fd004c7497..a99b573abc 100644
--- a/test/runner/lib/data.py
+++ b/test/lib/ansible_test/_internal/data.py
@@ -4,30 +4,30 @@ __metaclass__ = type
 
 import os
 
-import lib.types as t
+from . import types as t
 
-from lib.util import (
+from .util import (
     ApplicationError,
     import_plugins,
     ANSIBLE_ROOT,
     is_subdir,
 )
 
-from lib.provider import (
+from .provider import (
     find_path_provider,
     get_path_provider_classes,
     ProviderNotFoundForPath,
 )
 
-from lib.provider.source import (
+from .provider.source import (
     SourceProvider,
 )
 
-from lib.provider.source.unversioned import (
+from .provider.source.unversioned import (
     UnversionedSource,
 )
 
-from lib.provider.layout import (
+from .provider.layout import (
     ContentLayout,
     InstallLayout,
     LayoutProvider,
diff --git a/test/runner/lib/delegation.py b/test/lib/ansible_test/_internal/delegation.py
index baeb4585a0..35e09fa73a 100644
--- a/test/runner/lib/delegation.py
+++ b/test/lib/ansible_test/_internal/delegation.py
@@ -7,7 +7,7 @@ import re
 import sys
 import tempfile
 
-from lib.executor import (
+from .executor import (
     SUPPORTED_PYTHON_VERSIONS,
     HTTPTESTER_HOSTS,
     create_shell_command,
@@ -19,7 +19,7 @@ from lib.executor import (
     get_remote_completion,
 )
 
-from lib.config import (
+from .config import (
     TestConfig,
     EnvironmentConfig,
     IntegrationConfig,
@@ -28,16 +28,16 @@ from lib.config import (
     UnitsConfig,
 )
 
-from lib.core_ci import (
+from .core_ci import (
     AnsibleCoreCI,
 )
 
-from lib.manage_ci import (
+from .manage_ci import (
     ManagePosixCI,
     ManageWindowsCI,
 )
 
-from lib.util import (
+from .util import (
     ApplicationError,
     common_environment,
     pass_vars,
@@ -46,11 +46,11 @@ from lib.util import (
     ANSIBLE_TEST_DATA_ROOT,
 )
 
-from lib.util_common import (
+from .util_common import (
     run_command,
 )
 
-from lib.docker_util import (
+from .docker_util import (
     docker_exec,
     docker_get,
     docker_pull,
@@ -62,19 +62,19 @@ from lib.docker_util import (
     get_docker_networks,
 )
 
-from lib.cloud import (
+from .cloud import (
     get_cloud_providers,
 )
 
-from lib.target import (
+from .target import (
     IntegrationTarget,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
-from lib.payload import (
+from .payload import (
     create_payload,
 )
 
diff --git a/test/runner/lib/diff.py b/test/lib/ansible_test/_internal/diff.py
index f0cb93d4fd..1e2038b98b 100644
--- a/test/runner/lib/diff.py
+++ b/test/lib/ansible_test/_internal/diff.py
@@ -6,9 +6,9 @@ import re
 import textwrap
 import traceback
 
-import lib.types as t
+from . import types as t
 
-from lib.util import (
+from .util import (
     ApplicationError,
 )
 
diff --git a/test/runner/lib/docker_util.py b/test/lib/ansible_test/_internal/docker_util.py
index d8332ef7bd..ebee766f3a 100644
--- a/test/runner/lib/docker_util.py
+++ b/test/lib/ansible_test/_internal/docker_util.py
@@ -6,7 +6,7 @@ import json
 import os
 import time
 
-from lib.util import (
+from .util import (
     ApplicationError,
     common_environment,
     display,
@@ -14,11 +14,11 @@ from lib.util import (
     SubprocessError,
 )
 
-from lib.util_common import (
+from .util_common import (
     run_command,
 )
 
-from lib.config import (
+from .config import (
     EnvironmentConfig,
 )
 
diff --git a/test/runner/lib/env.py b/test/lib/ansible_test/_internal/env.py
index 97d6bb225c..2a2e0aa880 100644
--- a/test/runner/lib/env.py
+++ b/test/lib/ansible_test/_internal/env.py
@@ -12,12 +12,12 @@ import signal
 import sys
 import time
 
-from lib.config import (
+from .config import (
     CommonConfig,
     TestConfig,
 )
 
-from lib.util import (
+from .util import (
     display,
     find_executable,
     raw_command,
@@ -25,28 +25,28 @@ from lib.util import (
     ApplicationError,
 )
 
-from lib.ansible_util import (
+from .ansible_util import (
     ansible_environment,
 )
 
-from lib.git import (
+from .git import (
     Git,
 )
 
-from lib.docker_util import (
+from .docker_util import (
     docker_info,
     docker_version
 )
 
-from lib.thread import (
+from .thread import (
     WrappedThread,
 )
 
-from lib.constants import (
+from .constants import (
     TIMEOUT_PATH,
 )
 
-from lib.test import (
+from .test import (
     TestTimeout,
 )
 
diff --git a/test/runner/lib/executor.py b/test/lib/ansible_test/_internal/executor.py
index c00cf9e57e..a93766309e 100644
--- a/test/runner/lib/executor.py
+++ b/test/lib/ansible_test/_internal/executor.py
@@ -18,23 +18,23 @@ import random
 import string
 import shutil
 
-import lib.types as t
+from . import types as t
 
-from lib.thread import (
+from .thread import (
     WrappedThread,
 )
 
-from lib.core_ci import (
+from .core_ci import (
     AnsibleCoreCI,
     SshKey,
 )
 
-from lib.manage_ci import (
+from .manage_ci import (
     ManageWindowsCI,
     ManageNetworkCI,
 )
 
-from lib.cloud import (
+from .cloud import (
     cloud_filter,
     cloud_init,
     get_cloud_environment,
@@ -42,7 +42,7 @@ from lib.cloud import (
     CloudEnvironmentConfig,
 )
 
-from lib.util import (
+from .util import (
     ApplicationWarning,
     ApplicationError,
     SubprocessError,
@@ -66,14 +66,14 @@ from lib.util import (
     is_subdir,
 )
 
-from lib.util_common import (
+from .util_common import (
     get_python_path,
     intercept_command,
     named_temporary_file,
     run_command,
 )
 
-from lib.docker_util import (
+from .docker_util import (
     docker_pull,
     docker_run,
     docker_available,
@@ -82,12 +82,12 @@ from lib.docker_util import (
     get_docker_container_ip,
 )
 
-from lib.ansible_util import (
+from .ansible_util import (
     ansible_environment,
     check_pyyaml,
 )
 
-from lib.target import (
+from .target import (
     IntegrationTarget,
     walk_internal_targets,
     walk_posix_integration_targets,
@@ -96,20 +96,20 @@ from lib.target import (
     walk_units_targets,
 )
 
-from lib.changes import (
+from .changes import (
     ShippableChanges,
     LocalChanges,
 )
 
-from lib.git import (
+from .git import (
     Git,
 )
 
-from lib.classification import (
+from .classification import (
     categorize_changes,
 )
 
-from lib.config import (
+from .config import (
     TestConfig,
     EnvironmentConfig,
     IntegrationConfig,
@@ -120,21 +120,21 @@ from lib.config import (
     WindowsIntegrationConfig,
 )
 
-from lib.metadata import (
+from .metadata import (
     ChangeDescription,
 )
 
-from lib.integration import (
+from .integration import (
     integration_test_environment,
     integration_test_config_file,
     setup_common_temp_dir,
 )
 
-from lib.coverage_util import (
+from .coverage_util import (
     coverage_context,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
@@ -1386,7 +1386,7 @@ def command_units(args):
             plugins.append('ansible_pytest_collections')
 
         if plugins:
-            env['PYTHONPATH'] += ':%s' % os.path.join(ANSIBLE_ROOT, 'test/units/pytest/plugins')
+            env['PYTHONPATH'] += ':%s' % os.path.join(ANSIBLE_TEST_DATA_ROOT, 'pytest/plugins')
 
             for plugin in plugins:
                 cmd.extend(['-p', plugin])
diff --git a/test/runner/lib/git.py b/test/lib/ansible_test/_internal/git.py
index f6d0eccfa3..28d946ade4 100644
--- a/test/runner/lib/git.py
+++ b/test/lib/ansible_test/_internal/git.py
@@ -2,9 +2,9 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-import lib.types as t
+from . import types as t
 
-from lib.util import (
+from .util import (
     SubprocessError,
     raw_command,
 )
diff --git a/test/runner/lib/http.py b/test/lib/ansible_test/_internal/http.py
index 18a429c51f..6607a10bc0 100644
--- a/test/runner/lib/http.py
+++ b/test/lib/ansible_test/_internal/http.py
@@ -21,13 +21,13 @@ except ImportError:
     # noinspection PyCompatibility, PyUnresolvedReferences
     from urllib.parse import urlparse, urlunparse, parse_qs  # pylint: disable=locally-disabled, ungrouped-imports
 
-from lib.util import (
+from .util import (
     ApplicationError,
     SubprocessError,
     display,
 )
 
-from lib.util_common import (
+from .util_common import (
     CommonConfig,
     run_command,
 )
diff --git a/test/runner/lib/import_analysis.py b/test/lib/ansible_test/_internal/import_analysis.py
index ed1f181872..a1f58eb4f5 100644
--- a/test/runner/lib/import_analysis.py
+++ b/test/lib/ansible_test/_internal/import_analysis.py
@@ -5,12 +5,12 @@ __metaclass__ = type
 import ast
 import os
 
-from lib.util import (
+from .util import (
     display,
     ApplicationError,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
diff --git a/test/runner/lib/init.py b/test/lib/ansible_test/_internal/init.py
index 5ce29a7e39..682e6b0cf1 100644
--- a/test/runner/lib/init.py
+++ b/test/lib/ansible_test/_internal/init.py
@@ -4,7 +4,7 @@ __metaclass__ = type
 
 import resource
 
-from lib.constants import (
+from .constants import (
     SOFT_RLIMIT_NOFILE,
 )
 
diff --git a/test/runner/lib/integration/__init__.py b/test/lib/ansible_test/_internal/integration/__init__.py
index 0d13777ee7..30531209a0 100644
--- a/test/runner/lib/integration/__init__.py
+++ b/test/lib/ansible_test/_internal/integration/__init__.py
@@ -8,18 +8,18 @@ import os
 import shutil
 import tempfile
 
-from lib.target import (
+from ..target import (
     analyze_integration_target_dependencies,
     walk_integration_targets,
 )
 
-from lib.config import (
+from ..config import (
     NetworkIntegrationConfig,
     PosixIntegrationConfig,
     WindowsIntegrationConfig,
 )
 
-from lib.util import (
+from ..util import (
     ApplicationError,
     display,
     make_dirs,
@@ -32,23 +32,23 @@ from lib.util import (
     to_bytes,
 )
 
-from lib.util_common import (
+from ..util_common import (
     named_temporary_file,
 )
 
-from lib.coverage_util import (
+from ..coverage_util import (
     generate_collection_coverage_config,
 )
 
-from lib.cache import (
+from ..cache import (
     CommonCache,
 )
 
-from lib.cloud import (
+from ..cloud import (
     CloudEnvironmentConfig,
 )
 
-from lib.data import (
+from ..data import (
     data_context,
 )
 
diff --git a/test/runner/lib/manage_ci.py b/test/lib/ansible_test/_internal/manage_ci.py
index 732d554ac5..3b13c36f36 100644
--- a/test/runner/lib/manage_ci.py
+++ b/test/lib/ansible_test/_internal/manage_ci.py
@@ -6,7 +6,7 @@ import os
 import tempfile
 import time
 
-from lib.util import (
+from .util import (
     SubprocessError,
     ApplicationError,
     cmd_quote,
@@ -14,24 +14,24 @@ from lib.util import (
     ANSIBLE_TEST_DATA_ROOT,
 )
 
-from lib.util_common import (
+from .util_common import (
     intercept_command,
     run_command,
 )
 
-from lib.core_ci import (
+from .core_ci import (
     AnsibleCoreCI,
 )
 
-from lib.ansible_util import (
+from .ansible_util import (
     ansible_environment,
 )
 
-from lib.config import (
+from .config import (
     ShellConfig,
 )
 
-from lib.payload import (
+from .payload import (
     create_payload,
 )
 
diff --git a/test/runner/lib/metadata.py b/test/lib/ansible_test/_internal/metadata.py
index 4fbcb17e9c..4abd239b8e 100644
--- a/test/runner/lib/metadata.py
+++ b/test/lib/ansible_test/_internal/metadata.py
@@ -4,14 +4,14 @@ __metaclass__ = type
 
 import json
 
-import lib.types as t
+from . import types as t
 
-from lib.util import (
+from .util import (
     display,
     is_shippable,
 )
 
-from lib.diff import (
+from .diff import (
     parse_diff,
     FileDiff,
 )
diff --git a/test/runner/lib/payload.py b/test/lib/ansible_test/_internal/payload.py
index cd09ab39a8..12127e75d0 100644
--- a/test/runner/lib/payload.py
+++ b/test/lib/ansible_test/_internal/payload.py
@@ -6,21 +6,21 @@ import os
 import tarfile
 import time
 
-from lib.config import (
+from .config import (
     IntegrationConfig,
     ShellConfig,
 )
 
-from lib.util import (
+from .util import (
     display,
     ANSIBLE_ROOT,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
-from lib.util_common import (
+from .util_common import (
     CommonConfig,
 )
 
@@ -40,10 +40,8 @@ def create_payload(args, dst_path):  # type: (CommonConfig, str) -> None
         files = [f for f in files if
                  f[1].startswith('bin/') or
                  f[1].startswith('lib/') or
-                 f[1].startswith('test/runner/') or
+                 f[1].startswith('test/lib/') or
                  f[1].startswith('packaging/requirements/') or
-                 f[1].startswith('test/sanity/') or  # sanity only
-                 f[1].startswith('test/units/pytest/plugins/') or  # units only
                  f[1] in (
                      'setup.py',
                      'README.rst',
diff --git a/test/runner/lib/powershell_import_analysis.py b/test/lib/ansible_test/_internal/powershell_import_analysis.py
index 61e031774f..4d16249064 100644
--- a/test/runner/lib/powershell_import_analysis.py
+++ b/test/lib/ansible_test/_internal/powershell_import_analysis.py
@@ -5,11 +5,11 @@ __metaclass__ = type
 import os
 import re
 
-from lib.util import (
+from .util import (
     display,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
diff --git a/test/runner/lib/provider/__init__.py b/test/lib/ansible_test/_internal/provider/__init__.py
index 0a08090226..f5ab0dd44e 100644
--- a/test/runner/lib/provider/__init__.py
+++ b/test/lib/ansible_test/_internal/provider/__init__.py
@@ -5,9 +5,9 @@ __metaclass__ = type
 import abc
 import os
 
-import lib.types as t
+from .. import types as t
 
-from lib.util import (
+from ..util import (
     ABC,
     ApplicationError,
     get_subclasses,
diff --git a/test/runner/lib/provider/layout/__init__.py b/test/lib/ansible_test/_internal/provider/layout/__init__.py
index 1a56874305..87f85ccc48 100644
--- a/test/runner/lib/provider/layout/__init__.py
+++ b/test/lib/ansible_test/_internal/provider/layout/__init__.py
@@ -6,9 +6,9 @@ import abc
 import collections
 import os
 
-import lib.types as t
+from ... import types as t
 
-from lib.util import (
+from ...util import (
     ANSIBLE_ROOT,
 )
 
diff --git a/test/runner/lib/provider/layout/ansible.py b/test/lib/ansible_test/_internal/provider/layout/ansible.py
index 8ff4a3d1f8..bbf076bdfe 100644
--- a/test/runner/lib/provider/layout/ansible.py
+++ b/test/lib/ansible_test/_internal/provider/layout/ansible.py
@@ -5,7 +5,11 @@ __metaclass__ = type
 import os
 import re
 
-import lib.types as t
+from ... import types as t
+
+from ...util import (
+    ANSIBLE_TEST_ROOT,
+)
 
 from . import (
     ContentLayout,
@@ -23,10 +27,10 @@ class AnsibleLayout(LayoutProvider):
     def create(self, root, paths):  # type: (str, t.List[str]) -> ContentLayout
         """Create a Layout using the given root and paths."""
         plugin_types = sorted(set(p.split('/')[3] for p in paths if re.search(r'^lib/ansible/plugins/[^/]+/', p)))
-        provider_types = sorted(set(p.split('/')[4] for p in paths if re.search(r'^test/runner/lib/provider/[^/]+/', p)))
+        provider_types = sorted(set(p.split('/')[5] for p in paths if re.search(r'^test/lib/ansible_test/_internal/provider/[^/]+/', p)))
 
         plugin_paths = dict((p, os.path.join('lib/ansible/plugins', p)) for p in plugin_types)
-        provider_paths = dict((p, os.path.join('test/runner/lib/provider', p)) for p in provider_types)
+        provider_paths = dict((p, os.path.join(ANSIBLE_TEST_ROOT, '_internal/provider', p)) for p in provider_types)
 
         plugin_paths.update(dict(
             modules='lib/ansible/modules',
diff --git a/test/runner/lib/provider/layout/collection.py b/test/lib/ansible_test/_internal/provider/layout/collection.py
index fb0aa16e4a..2c778c07c0 100644
--- a/test/runner/lib/provider/layout/collection.py
+++ b/test/lib/ansible_test/_internal/provider/layout/collection.py
@@ -5,7 +5,7 @@ __metaclass__ = type
 import os
 import re
 
-import lib.types as t
+from ... import types as t
 
 from . import (
     ContentLayout,
diff --git a/test/runner/lib/provider/source/__init__.py b/test/lib/ansible_test/_internal/provider/source/__init__.py
index 29ebb9dad4..fab28b0903 100644
--- a/test/runner/lib/provider/source/__init__.py
+++ b/test/lib/ansible_test/_internal/provider/source/__init__.py
@@ -4,7 +4,7 @@ __metaclass__ = type
 
 import abc
 
-import lib.types as t
+from ... import types as t
 
 from .. import (
     PathProvider,
diff --git a/test/runner/lib/provider/source/git.py b/test/lib/ansible_test/_internal/provider/source/git.py
index be5175af00..5b530b641f 100644
--- a/test/runner/lib/provider/source/git.py
+++ b/test/lib/ansible_test/_internal/provider/source/git.py
@@ -4,9 +4,9 @@ __metaclass__ = type
 
 import os
 
-import lib.types as t
+from ... import types as t
 
-from lib.git import (
+from ...git import (
     Git,
 )
 
diff --git a/test/runner/lib/provider/source/unversioned.py b/test/lib/ansible_test/_internal/provider/source/unversioned.py
index dabd243cf0..2975af627e 100644
--- a/test/runner/lib/provider/source/unversioned.py
+++ b/test/lib/ansible_test/_internal/provider/source/unversioned.py
@@ -4,9 +4,9 @@ __metaclass__ = type
 
 import os
 
-import lib.types as t
+from ... import types as t
 
-from lib.constants import (
+from ...constants import (
     TIMEOUT_PATH,
 )
 
diff --git a/test/runner/lib/sanity/__init__.py b/test/lib/ansible_test/_internal/sanity/__init__.py
index e8f6120c80..310208e969 100644
--- a/test/runner/lib/sanity/__init__.py
+++ b/test/lib/ansible_test/_internal/sanity/__init__.py
@@ -9,9 +9,9 @@ import os
 import re
 import collections
 
-import lib.types as t
+from .. import types as t
 
-from lib.util import (
+from ..util import (
     ApplicationError,
     SubprocessError,
     display,
@@ -19,7 +19,7 @@ from lib.util import (
     load_plugins,
     parse_to_list_of_dict,
     ABC,
-    ANSIBLE_ROOT,
+    ANSIBLE_TEST_DATA_ROOT,
     is_binary_file,
     read_lines_without_comments,
     get_available_python_versions,
@@ -28,22 +28,22 @@ from lib.util import (
     paths_to_dirs,
 )
 
-from lib.util_common import (
+from ..util_common import (
     run_command,
 )
 
-from lib.ansible_util import (
+from ..ansible_util import (
     ansible_environment,
     check_pyyaml,
 )
 
-from lib.target import (
+from ..target import (
     walk_internal_targets,
     walk_sanity_targets,
     TestTarget,
 )
 
-from lib.executor import (
+from ..executor import (
     get_changes_filter,
     AllTargetsSkipped,
     Delegate,
@@ -51,11 +51,11 @@ from lib.executor import (
     SUPPORTED_PYTHON_VERSIONS,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
-from lib.test import (
+from ..test import (
     TestSuccess,
     TestFailure,
     TestSkipped,
@@ -63,16 +63,16 @@ from lib.test import (
     calculate_best_confidence,
 )
 
-from lib.data import (
+from ..data import (
     data_context,
 )
 
-from lib.env import (
+from ..env import (
     get_ansible_version,
 )
 
 COMMAND = 'sanity'
-SANITY_ROOT = os.path.join(ANSIBLE_ROOT, 'test', 'sanity')
+SANITY_ROOT = os.path.join(ANSIBLE_TEST_DATA_ROOT, 'sanity')
 
 
 def command_sanity(args):
diff --git a/test/runner/lib/sanity/ansible_doc.py b/test/lib/ansible_test/_internal/sanity/ansible_doc.py
index 805215136c..27bdfff48c 100644
--- a/test/runner/lib/sanity/ansible_doc.py
+++ b/test/lib/ansible_test/_internal/sanity/ansible_doc.py
@@ -6,42 +6,42 @@ import collections
 import os
 import re
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanitySingleVersion,
     SanityFailure,
     SanitySuccess,
     SanityMessage,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.util import (
+from ..util import (
     SubprocessError,
     display,
     is_subdir,
 )
 
-from lib.util_common import (
+from ..util_common import (
     intercept_command,
 )
 
-from lib.ansible_util import (
+from ..ansible_util import (
     ansible_environment,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
-from lib.data import (
+from ..data import (
     data_context,
 )
 
-from lib.coverage_util import (
+from ..coverage_util import (
     coverage_context,
 )
 
diff --git a/test/runner/lib/sanity/compile.py b/test/lib/ansible_test/_internal/sanity/compile.py
index 6f6aa3961b..5a517272fa 100644
--- a/test/runner/lib/sanity/compile.py
+++ b/test/lib/ansible_test/_internal/sanity/compile.py
@@ -4,9 +4,9 @@ __metaclass__ = type
 
 import os
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanityMultipleVersion,
     SanityMessage,
     SanityFailure,
@@ -15,11 +15,11 @@ from lib.sanity import (
     SANITY_ROOT,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.util import (
+from ..util import (
     SubprocessError,
     display,
     find_python,
@@ -27,11 +27,11 @@ from lib.util import (
     is_subdir,
 )
 
-from lib.util_common import (
+from ..util_common import (
     run_command,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
diff --git a/test/runner/lib/sanity/ignores.py b/test/lib/ansible_test/_internal/sanity/ignores.py
index 3cee330a68..8b6df50ce4 100644
--- a/test/runner/lib/sanity/ignores.py
+++ b/test/lib/ansible_test/_internal/sanity/ignores.py
@@ -4,7 +4,7 @@ __metaclass__ = type
 
 import os
 
-from lib.sanity import (
+from ..sanity import (
     SanityFailure,
     SanityIgnoreParser,
     SanityVersionNeutral,
@@ -12,12 +12,12 @@ from lib.sanity import (
     SanityMessage,
 )
 
-from lib.test import (
+from ..test import (
     calculate_confidence,
     calculate_best_confidence,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
diff --git a/test/runner/lib/sanity/import.py b/test/lib/ansible_test/_internal/sanity/import.py
index 15bedfb2cf..921565e549 100644
--- a/test/runner/lib/sanity/import.py
+++ b/test/lib/ansible_test/_internal/sanity/import.py
@@ -4,9 +4,9 @@ __metaclass__ = type
 
 import os
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanityMultipleVersion,
     SanityMessage,
     SanityFailure,
@@ -14,11 +14,11 @@ from lib.sanity import (
     SANITY_ROOT,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.util import (
+from ..util import (
     SubprocessError,
     remove_tree,
     display,
@@ -28,28 +28,28 @@ from lib.util import (
     is_subdir,
 )
 
-from lib.util_common import (
+from ..util_common import (
     intercept_command,
     run_command,
 )
 
-from lib.ansible_util import (
+from ..ansible_util import (
     ansible_environment,
 )
 
-from lib.executor import (
+from ..executor import (
     generate_pip_install,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
-from lib.coverage_util import (
+from ..coverage_util import (
     coverage_context,
 )
 
-from lib.data import (
+from ..data import (
     data_context,
     ANSIBLE_ROOT,
 )
diff --git a/test/runner/lib/sanity/integration_aliases.py b/test/lib/ansible_test/_internal/sanity/integration_aliases.py
index 81324318da..e47b8bc505 100644
--- a/test/runner/lib/sanity/integration_aliases.py
+++ b/test/lib/ansible_test/_internal/sanity/integration_aliases.py
@@ -7,9 +7,9 @@ import textwrap
 import re
 import os
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanityVersionNeutral,
     SanityMessage,
     SanityFailure,
@@ -17,11 +17,11 @@ from lib.sanity import (
     SanityTargets,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
-from lib.target import (
+from ..target import (
     filter_targets,
     walk_posix_integration_targets,
     walk_windows_integration_targets,
@@ -29,11 +29,11 @@ from lib.target import (
     walk_module_targets,
 )
 
-from lib.cloud import (
+from ..cloud import (
     get_cloud_platforms,
 )
 
-from lib.util import (
+from ..util import (
     display,
 )
 
diff --git a/test/runner/lib/sanity/pep8.py b/test/lib/ansible_test/_internal/sanity/pep8.py
index 59e84671b7..9eb40dbce7 100644
--- a/test/runner/lib/sanity/pep8.py
+++ b/test/lib/ansible_test/_internal/sanity/pep8.py
@@ -4,9 +4,9 @@ __metaclass__ = type
 
 import os
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanitySingleVersion,
     SanityMessage,
     SanityFailure,
@@ -14,11 +14,11 @@ from lib.sanity import (
     SANITY_ROOT,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.util import (
+from ..util import (
     SubprocessError,
     read_lines_without_comments,
     parse_to_list_of_dict,
@@ -26,11 +26,11 @@ from lib.util import (
     is_subdir,
 )
 
-from lib.util_common import (
+from ..util_common import (
     run_command,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
diff --git a/test/runner/lib/sanity/pslint.py b/test/lib/ansible_test/_internal/sanity/pslint.py
index ac7a0b96a2..256eee0464 100644
--- a/test/runner/lib/sanity/pslint.py
+++ b/test/lib/ansible_test/_internal/sanity/pslint.py
@@ -6,9 +6,9 @@ import json
 import os
 import re
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanityVersionNeutral,
     SanityMessage,
     SanityFailure,
@@ -17,25 +17,25 @@ from lib.sanity import (
     SANITY_ROOT,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.util import (
+from ..util import (
     SubprocessError,
     find_executable,
     ANSIBLE_TEST_DATA_ROOT,
 )
 
-from lib.util_common import (
+from ..util_common import (
     run_command,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
-from lib.data import (
+from ..data import (
     data_context,
 )
 
diff --git a/test/runner/lib/sanity/pylint.py b/test/lib/ansible_test/_internal/sanity/pylint.py
index 6d2db308a7..e635ca1d20 100644
--- a/test/runner/lib/sanity/pylint.py
+++ b/test/lib/ansible_test/_internal/sanity/pylint.py
@@ -7,9 +7,9 @@ import json
 import os
 import datetime
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanitySingleVersion,
     SanityMessage,
     SanityFailure,
@@ -17,32 +17,31 @@ from lib.sanity import (
     SANITY_ROOT,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.util import (
+from ..util import (
     SubprocessError,
     display,
     ConfigParser,
-    ANSIBLE_ROOT,
     is_subdir,
     find_python,
 )
 
-from lib.util_common import (
+from ..util_common import (
     run_command,
 )
 
-from lib.ansible_util import (
+from ..ansible_util import (
     ansible_environment,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
-from lib.data import (
+from ..data import (
     data_context,
 )
 
@@ -126,9 +125,9 @@ class PylintTest(SanitySingleVersion):
         if data_context().content.collection:
             add_context(remaining_paths, 'collection', lambda p: True)
         else:
-            add_context(remaining_paths, 'validate-modules', filter_path('test/sanity/validate-modules/'))
-            add_context(remaining_paths, 'sanity', filter_path('test/sanity/'))
-            add_context(remaining_paths, 'ansible-test', filter_path('test/runner/'))
+            add_context(remaining_paths, 'validate-modules', filter_path('test/lib/ansible_test/_data/sanity/validate-modules/'))
+            add_context(remaining_paths, 'sanity', filter_path('test/lib/ansible_test/_data/sanity/'))
+            add_context(remaining_paths, 'ansible-test', filter_path('test/lib/'))
             add_context(remaining_paths, 'test', filter_path('test/'))
             add_context(remaining_paths, 'hacking', filter_path('hacking/'))
             add_context(remaining_paths, 'ansible', lambda p: True)
diff --git a/test/runner/lib/sanity/rstcheck.py b/test/lib/ansible_test/_internal/sanity/rstcheck.py
index e1f26c92b3..2d8a01d544 100644
--- a/test/runner/lib/sanity/rstcheck.py
+++ b/test/lib/ansible_test/_internal/sanity/rstcheck.py
@@ -4,9 +4,9 @@ __metaclass__ = type
 
 import os
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanitySingleVersion,
     SanityMessage,
     SanityFailure,
@@ -14,22 +14,22 @@ from lib.sanity import (
     SANITY_ROOT,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.util import (
+from ..util import (
     SubprocessError,
     parse_to_list_of_dict,
     read_lines_without_comments,
     find_python,
 )
 
-from lib.util_common import (
+from ..util_common import (
     run_command,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
diff --git a/test/runner/lib/sanity/sanity_docs.py b/test/lib/ansible_test/_internal/sanity/sanity_docs.py
index 21e38582c7..44638075ee 100644
--- a/test/runner/lib/sanity/sanity_docs.py
+++ b/test/lib/ansible_test/_internal/sanity/sanity_docs.py
@@ -4,7 +4,7 @@ __metaclass__ = type
 
 import os
 
-from lib.sanity import (
+from ..sanity import (
     SanityVersionNeutral,
     SanityMessage,
     SanityFailure,
@@ -12,11 +12,11 @@ from lib.sanity import (
     sanity_get_tests,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
-from lib.data import (
+from ..data import (
     data_context,
 )
 
diff --git a/test/runner/lib/sanity/shellcheck.py b/test/lib/ansible_test/_internal/sanity/shellcheck.py
index d6ec5e736e..82689ced1e 100644
--- a/test/runner/lib/sanity/shellcheck.py
+++ b/test/lib/ansible_test/_internal/sanity/shellcheck.py
@@ -9,9 +9,9 @@ from xml.etree.ElementTree import (
     Element,
 )
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanityVersionNeutral,
     SanityMessage,
     SanityFailure,
@@ -20,21 +20,21 @@ from lib.sanity import (
     SANITY_ROOT,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.util import (
+from ..util import (
     SubprocessError,
     read_lines_without_comments,
     find_executable,
 )
 
-from lib.util_common import (
+from ..util_common import (
     run_command,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
diff --git a/test/runner/lib/sanity/validate_modules.py b/test/lib/ansible_test/_internal/sanity/validate_modules.py
index d33b345921..ee18f4e4c5 100644
--- a/test/runner/lib/sanity/validate_modules.py
+++ b/test/lib/ansible_test/_internal/sanity/validate_modules.py
@@ -5,9 +5,9 @@ __metaclass__ = type
 import json
 import os
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanitySingleVersion,
     SanityMessage,
     SanityFailure,
@@ -15,29 +15,29 @@ from lib.sanity import (
     SANITY_ROOT,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.util import (
+from ..util import (
     SubprocessError,
     display,
     find_python,
 )
 
-from lib.util_common import (
+from ..util_common import (
     run_command,
 )
 
-from lib.ansible_util import (
+from ..ansible_util import (
     ansible_environment,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
-from lib.data import (
+from ..data import (
     data_context,
 )
 
diff --git a/test/runner/lib/sanity/yamllint.py b/test/lib/ansible_test/_internal/sanity/yamllint.py
index 5b67fe6ce0..2c86749e01 100644
--- a/test/runner/lib/sanity/yamllint.py
+++ b/test/lib/ansible_test/_internal/sanity/yamllint.py
@@ -5,9 +5,9 @@ __metaclass__ = type
 import json
 import os
 
-import lib.types as t
+from .. import types as t
 
-from lib.sanity import (
+from ..sanity import (
     SanitySingleVersion,
     SanityMessage,
     SanityFailure,
@@ -15,26 +15,26 @@ from lib.sanity import (
     SANITY_ROOT,
 )
 
-from lib.target import (
+from ..target import (
     TestTarget,
 )
 
-from lib.util import (
+from ..util import (
     SubprocessError,
     display,
     is_subdir,
     find_python,
 )
 
-from lib.util_common import (
+from ..util_common import (
     run_command,
 )
 
-from lib.config import (
+from ..config import (
     SanityConfig,
 )
 
-from lib.data import (
+from ..data import (
     data_context,
 )
 
diff --git a/test/runner/lib/target.py b/test/lib/ansible_test/_internal/target.py
index b8a3be8541..a152169a6e 100644
--- a/test/runner/lib/target.py
+++ b/test/lib/ansible_test/_internal/target.py
@@ -9,7 +9,7 @@ import errno
 import itertools
 import abc
 
-from lib.util import (
+from .util import (
     ApplicationError,
     display,
     read_lines_without_comments,
@@ -18,7 +18,7 @@ from lib.util import (
     to_bytes,
 )
 
-from lib.data import (
+from .data import (
     data_context,
 )
 
diff --git a/test/runner/lib/test.py b/test/lib/ansible_test/_internal/test.py
index dd46dfca83..c33212fe14 100644
--- a/test/runner/lib/test.py
+++ b/test/lib/ansible_test/_internal/test.py
@@ -6,15 +6,15 @@ import datetime
 import json
 import os
 
-import lib.types as t
+from . import types as t
 
-from lib.util import (
+from .util import (
     display,
     make_dirs,
     to_bytes,
 )
 
-from lib.config import (
+from .config import (
     TestConfig,
 )
 
diff --git a/test/runner/lib/thread.py b/test/lib/ansible_test/_internal/thread.py
index 49fbc1baff..49fbc1baff 100644
--- a/test/runner/lib/thread.py
+++ b/test/lib/ansible_test/_internal/thread.py
diff --git a/test/runner/lib/types.py b/test/lib/ansible_test/_internal/types.py
index 72a11ddc21..72a11ddc21 100644
--- a/test/runner/lib/types.py
+++ b/test/lib/ansible_test/_internal/types.py
diff --git a/test/runner/lib/util.py b/test/lib/ansible_test/_internal/util.py
index 500194ecfc..da86c8ad40 100644
--- a/test/runner/lib/util.py
+++ b/test/lib/ansible_test/_internal/util.py
@@ -41,7 +41,7 @@ except ImportError:
     # noinspection PyProtectedMember
     from pipes import quote as cmd_quote
 
-import lib.types as t
+from . import types as t
 
 try:
     C = t.TypeVar('C')
@@ -62,8 +62,9 @@ except AttributeError:
 COVERAGE_CONFIG_PATH = '.coveragerc'
 COVERAGE_OUTPUT_PATH = 'coverage'
 
-ANSIBLE_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
-ANSIBLE_TEST_DATA_ROOT = os.path.join(ANSIBLE_ROOT, 'test', 'runner')
+ANSIBLE_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
+ANSIBLE_TEST_ROOT = os.path.join(ANSIBLE_ROOT, 'test', 'lib', 'ansible_test')
+ANSIBLE_TEST_DATA_ROOT = os.path.join(ANSIBLE_TEST_ROOT, '_data')
 
 # Modes are set to allow all users the same level of access.
 # This permits files to be used in tests that change users.
diff --git a/test/runner/lib/util_common.py b/test/lib/ansible_test/_internal/util_common.py
index df498e4a9a..1be296b885 100644
--- a/test/runner/lib/util_common.py
+++ b/test/lib/ansible_test/_internal/util_common.py
@@ -9,7 +9,7 @@ import shutil
 import tempfile
 import textwrap
 
-from lib.util import (
+from .util import (
     common_environment,
     COVERAGE_CONFIG_PATH,
     COVERAGE_OUTPUT_PATH,
diff --git a/test/lib/ansible_test/tests/Makefile b/test/lib/ansible_test/tests/Makefile
new file mode 100644
index 0000000000..1e5afcd0a0
--- /dev/null
+++ b/test/lib/ansible_test/tests/Makefile
@@ -0,0 +1,9 @@
+all: sanity unit
+
+.PHONY: sanity
+sanity:
+	ansible-test sanity test/lib/ ${FLAGS}
+
+.PHONY: unit
+unit:
+	PYTHONPATH=../../lib/ pytest unit ${FLAGS}
diff --git a/test/lib/ansible_test/tests/__init__.py b/test/lib/ansible_test/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/lib/ansible_test/tests/__init__.py
diff --git a/test/lib/ansible_test/tests/unit/__init__.py b/test/lib/ansible_test/tests/unit/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/lib/ansible_test/tests/unit/__init__.py
diff --git a/test/runner/unit/test_diff.py b/test/lib/ansible_test/tests/unit/test_diff.py
index f44537a60d..93e7243b7a 100644
--- a/test/runner/unit/test_diff.py
+++ b/test/lib/ansible_test/tests/unit/test_diff.py
@@ -6,12 +6,12 @@ import os
 import subprocess
 import pytest
 
-from lib.util import (
+from ..._internal.util import (
     to_text,
     to_bytes,
 )
 
-from lib.diff import (
+from ..._internal.diff import (
     parse_diff,
     FileDiff,
 )
diff --git a/test/runner/Makefile b/test/runner/Makefile
deleted file mode 100644
index baee64a9dd..0000000000
--- a/test/runner/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-all: sanity unit
-
-.PHONY: sanity
-sanity:
-	ansible-test sanity test/runner/ ${FLAGS}
-
-.PHONY: unit
-unit:
-	PYTHONPATH=.:.. pytest unit ${FLAGS}
diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt
index dff84c62d0..8efa99592f 100644
--- a/test/sanity/ignore.txt
+++ b/test/sanity/ignore.txt
@@ -6916,10 +6916,10 @@ test/legacy/gce_credentials.py metaclass-boilerplate
 test/legacy/gce_credentials.py pylint:blacklisted-name
 test/legacy/setup_gce.py future-import-boilerplate
 test/legacy/setup_gce.py metaclass-boilerplate
-test/runner/requirements/constraints.txt test-constraints
-test/runner/requirements/integration.cloud.azure.txt test-constraints
-test/runner/setup/windows-httptester.ps1 pslint:PSCustomUseLiteralPath
-test/sanity/pylint/plugins/string_format.py use-compat-six
+test/lib/ansible_test/_data/requirements/constraints.txt test-constraints
+test/lib/ansible_test/_data/requirements/integration.cloud.azure.txt test-constraints
+test/lib/ansible_test/_data/setup/windows-httptester.ps1 pslint:PSCustomUseLiteralPath
+test/lib/ansible_test/_data/sanity/pylint/plugins/string_format.py use-compat-six
 test/units/cli/arguments/test_optparse_helpers.py future-import-boilerplate
 test/units/config/manager/test_find_ini_config_file.py future-import-boilerplate
 test/units/contrib/inventory/test_vmware_inventory.py future-import-boilerplate