diff --git a/requirements.txt b/requirements.txt
index e7e1e2c..a61c008 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6
-PyYAML>=3.1.0
-docutils
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-openstackdocstheme>=1.4.0  # Apache-2.0
+pbr>=1.6 # Apache-2.0
+PyYAML>=3.1.0 # MIT
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+openstackdocstheme>=1.5.0 # Apache-2.0
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 89a9024..390e56e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,11 +4,10 @@
 
 hacking<0.11,>=0.10.0
 
-coverage>=3.6
-python-subunit>=0.0.18
-oslosphinx>=2.5.0 # Apache-2.0
-testrepository>=0.0.18
-testtools>=1.4.0
-
+coverage>=3.6 # Apache-2.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
+oslosphinx>=4.7.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 sphinx-testing
-beautifulsoup4
+beautifulsoup4 # MIT