diff --git a/bindep.txt b/bindep.txt
new file mode 100644
index 00000000..67fa4991
--- /dev/null
+++ b/bindep.txt
@@ -0,0 +1,4 @@
+libvirt-dev [platform:dpkg]
+libvirt-devel [platform:redhat]
+pkg-config [platform:dpkg]
+pkgconfig [platform:redhat]
diff --git a/requirements.txt b/requirements.txt
index c01ade29..4aea299b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,14 @@
-# Nothing
+eventlet
+keyring
+keystoneauth1
+pkgconfig
+libvirt-python
+oslo.concurrency
+oslo.config
+oslo.i18n
+oslo.log
+oslo.messaging
+oslo.service
+python-daemon
+python-novaclient
+retrying
diff --git a/test-requirements.txt b/test-requirements.txt
index 8289d37f..2b5b92c9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,7 @@
 # hacking pulls in flake8
-hacking
+hacking>=1.1.0,<=2.0.0 # Apache-2.0
 bashate >= 0.2
-pylint<2.5.0
+isort<5;python_version>="3.0"
+pylint<2.1.0;python_version<"3.0" # GPLv2
+pylint<2.3.0;python_version>="3.0" # GPLv2
+
diff --git a/tox.ini b/tox.ini
index b3a08acd..dad3985f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,14 @@
 [tox]
-envlist = linters
+envlist = linters,pylint
 minversion = 2.3
 skipsdist = True
-sitepackages=False
 
 stxdir = {toxinidir}/..
 
 [testenv]
-install_command = pip install --use-deprecated legacy-resolver\
-    -v -v -v \
-    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
-    -U {opts} {packages}
+sitepackages = False
+basepython = python3
+install_command = pip install -v -v -v  -U {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}
     OS_STDOUT_CAPTURE=1
@@ -81,21 +79,11 @@ commands =
   flake8
 
 [testenv:pylint]
-basepython = python3
-sitepackages = False
 deps =
   {[testenv]deps}
-  -e{[tox]stxdir}/config/tsconfig/tsconfig
   -e{[tox]stxdir}/config/sysinv/sysinv/sysinv
+  -e{[tox]stxdir}/config/tsconfig/tsconfig
   -e{[tox]stxdir}/fault/fm-api
-  keyring
-  keystoneauth1
-  libvirt-python
-  oslo.messaging
-  oslo.service
-  pyinotify
-  python-daemon
-  python-novaclient
 
 commands = pylint {posargs}                                          \
   ceph/ceph-manager/ceph-manager/ceph_manager                        \