diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 2ad54bf..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-bashate>=0.2 # Apache-2.0
-flake8<2.6.0,>=2.5.4 # MIT
-pyasn1>=0.1.8 # BSD
-pyOpenSSL>=0.14 # Apache-2.0
-requests>=2.14.2 # Apache-2.0
-ndg-httpsclient>=0.4.2;python_version<'3.0' # BSD
diff --git a/tox.ini b/tox.ini
index f698536..80338a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,8 +8,6 @@ envlist = docs,linters,functional
 usedevelop = True
 install_command =
     pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-deps =
-    -r{toxinidir}/test-requirements.txt
 commands =
     /usr/bin/find . -type f -name "*.pyc" -delete
 passenv =
@@ -76,38 +74,24 @@ commands =
     bash -c "{toxinidir}/tests/common/test-bashate.sh"
 
 
-[testenv:ansible]
-deps =
-    {[testenv]deps}
-    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
-
-
 [testenv:ansible-syntax]
-deps =
-    {[testenv:ansible]deps}
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
 
 
 [testenv:ansible-lint]
-deps =
-    {[testenv:ansible]deps}
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
 
 
 [testenv:functional]
-deps =
-    {[testenv:ansible]deps}
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
 
 [testenv:linters]
-deps =
-    -r{toxinidir}/doc/requirements.txt
-    {[testenv:ansible]deps}
 commands =
+    bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
     {[testenv:pep8]commands}
     {[testenv:bashate]commands}
     {[testenv:ansible-lint]commands}