diff --git a/requirements.txt b/requirements.txt
index 031e25c..fc64fec 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,28 +2,26 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pytz>=2016.4
-pbr>=3.0.1
-Babel>=2.3.4
+pytz # MIT
+pbr!=2.1.0 # Apache-2.0
+Babel!=2.4.0 # BSD
 
-futures>=3.1.1
-python-cinderclient>=2.0.1
-python-glanceclient>=2.6.0
-python-openstackclient>=3.11.0
-python-neutronclient>=6.2.0
-python-novaclient>=9.0.0
-python-keystoneclient>=3.10.0
+futures!=0.17.0;python_version=='2.7' or python_version=='2.6' # PSF
+python-cinderclient!=4.0.0 # Apache-2.0
+python-glanceclient # Apache-2.0
+python-openstackclient # Apache-2.0
+python-neutronclient # Apache-2.0
+python-novaclient # Apache-2.0
+python-keystoneclient!=2.1.0 # Apache-2.0
 attrdict>=2.0.0
 hdrhistogram>=0.5.2
 # ipaddress is required to get TLS working
 # otherwise certificates with numeric IP addresses in the ServerAltName field will fail
-ipaddress>= 1.0.16
-oslo.config>=4.1.1
-oslo.log>=3.26.1
-pecan>=1.2.1
-redis>=2.10.5
-tabulate>=0.7.7
-pyyaml>=3.12
+ipaddress;python_version<'3.3' # PSF
+oslo.config!=4.3.0,!=4.4.0 # Apache-2.0
+oslo.log # Apache-2.0
+pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2 # BSD
+redis # MIT
+PyYAML # MIT
 
 # Workaround for pip install failed on RHEL/CentOS
-functools32>=3.2.3
diff --git a/setup.py b/setup.py
index ba74e1b..566d844 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
-    scripts=['kloudbuster/kb_extract_img_from_docker.sh'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index e01e7d7..fefee34 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,13 +4,12 @@
 
 hacking<0.11,>=0.10.0
 
-coverage>=3.6
-discover
-python-subunit>=0.0.18
-sphinx>=1.4.0,<2.0
-sphinx_rtd_theme>=0.1.9
-oslosphinx>=2.5.0  # Apache-2.0
-oslotest>=1.10.0  # Apache-2.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+coverage!=4.4 # Apache-2.0
+python-subunit # Apache-2.0/BSD
+sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD
+oslosphinx # Apache-2.0
+oslotest # Apache-2.0
+testrepository # Apache-2.0/BSD
+testscenarios # Apache-2.0/BSD
+testtools # MIT