diff --git a/test-requirements.txt b/test-requirements.txt
index ee18cc4..76dc1f4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,7 @@ flake8
 # We need to pin Ansible to <2.6 until Zuul supports it, otherwise ansible-lint
 # picks the latest version which is not known to work yet.
 ansible>=2.5.1,<2.6
-ansible-lint
+ansible-lint<4
+hacking>=1.1.0,<2.0.0
 bashate>=0.2
 zuul-sphinx>=0.1.1
diff --git a/tox.ini b/tox.ini
index d1e3f4b..a964e98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ commands =
 basepython = python3
 whitelist_externals = bash
 setenv =
-   ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/library
+   ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/base/library
 passenv =
   # NOTE(pabelanger): if you'd like to run tox -elinters locally, you'll need
   # to export ANSIBLE_ROLES_PATH pointing to the currect repos.
@@ -38,10 +38,7 @@ passenv =
 deps =
   # Zuul is required to supply the zuul ansible modules for ansible-lint
   -egit+https://git.openstack.org/openstack-infra/zuul#egg=zuul
-  ansible>=2.5.1,<2.6
-  ansible-lint
-  hacking>=0.10,<0.11
-  bashate>=0.2
+  -r{toxinidir}/test-requirements.txt
 commands =
   flake8 {posargs}
   # Ansible lint