diff --git a/requirements.txt b/requirements.txt
index 2a5abde..7acf1b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,5 +2,5 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.8 # Apache-2.0
-Babel>=2.3.4
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
+Babel!=2.4.0,>=2.3.4 # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index 1a7024f..7a2bf76 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,26 +2,26 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
--e git://github.com/openstack/heat.git@stable/ocata#egg=heat
+-e git://github.com/openstack/heat.git@stable/pike#egg=heat
 -e git://git.openstack.org/openstack/python-group-based-policy-client.git@master#egg=gbpclient
 # Hacking already pins down pep8, pyflakes and flake8
 hacking<0.11,>=0.10.0
 bandit>=1.1.0 # Apache-2.0
-coverage>=3.6 # Apache-2.0
+coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-kombu<4.0.0,>=3.0.25 # BSD
+kombu!=4.0.2,>=4.0.0 # BSD
 mock>=2.0 # BSD
 mox3!=0.19.0,>=0.7.0 # Apache-2.0
 PyMySQL>=0.7.6 # MIT License
-openstackdocstheme>=1.5.0 # Apache-2.0
+openstackdocstheme>=1.16.0 # Apache-2.0
 os-api-ref>=1.0.0 # Apache-2.0
-oslosphinx>=4.7.0 # Apache-2.0
+os-testr>=0.8.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 qpid-python;python_version=='2.7' # Apache-2.0
 psycopg2>=2.5 # LGPL/ZPL
-sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
+sphinx>=1.6.2 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 testresources>=0.2.4 # Apache-2.0/BSD
-reno>=1.8.0 # Apache2
+reno!=2.3.1,>=1.8.0 # Apache-2.0