diff --git a/requirements.txt b/requirements.txt
index cff14bb..7712726 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,16 +4,15 @@
 
 pbr>=1.6 # Apache-2.0
 
-eventlet
-flask
-sqlalchemy
-keystoneauth
-oslo.cache
-oslo.config
-oslo.messaging
-oslo.log
-oslo.db
-python-keystoneclient
-requests
-six
-uwsgi
+eventlet!=0.18.3,>=0.18.2 # MIT
+Flask!=0.11,<1.0,>=0.10 # BSD
+SQLAlchemy<1.1.0,>=1.0.10 # MIT
+oslo.cache>=1.5.0 # Apache-2.0
+oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
+oslo.messaging>=5.2.0 # Apache-2.0
+oslo.log>=3.11.0 # Apache-2.0
+oslo.db!=4.13.1,!=4.13.2,>=4.10.0 # Apache-2.0
+keystoneauth1>=2.14.0 # Apache-2.0
+python-keystoneclient>=3.6.0 # Apache-2.0
+requests>=2.10.0 # Apache-2.0
+six>=1.9.0 # MIT
diff --git a/setup.py b/setup.py
index 056c16c..782bb21 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 94c195e..1824e28 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,22 +2,21 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-os-testr
-testtools
-flake8
-mock
-requests_mock
+os-testr>=0.8.0 # Apache-2.0
+testtools>=1.4.0 # MIT
+flake8<2.6.0,>=2.5.4 # MIT
+mock>=2.0 # BSD
+requests-mock>=1.1 # Apache-2.0
 
-hacking>=0.11.0,<0.12 # Apache-2.0
+hacking<0.12,>=0.11.0 # Apache-2.0
 
-coverage>=3.6 # Apache-2.0
+coverage>=4.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.2.1,!=1.3b1,<1.4 # BSD
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
-testtools>=1.4.0 # MIT
 
 # releasenotes
-reno>=1.8.0 # Apache2
+reno>=1.8.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index dbe0a42..2ecb7c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,8 +33,10 @@ commands = oslo_debug_helper {posargs}
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
-
+# FIXME(knikolla): The tests here below need additional work to pass
+# They used to not be checked by our previous CI
+# H306, H301, E126, H238, E241, H405, H403, E121, H201
 show-source = True
-ignore = E123,E125
+ignore = E123,E125,H306,H301,E126,H238,E241,H405,H403,E121,H201
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build