diff --git a/requirements.txt b/requirements.txt
index 52a155d..bd5d481 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,6 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-python-heatclient>=0.2.9
+oslo.serialization>=1.2.0,<1.5  # uncapped by python-heatclient-0.3.0
+oslo.i18n>=1.3.0,<1.6  # uncapped by python-heatclient-0.3.0
+python-heatclient>=0.2.9,<0.4
diff --git a/test-requirements.txt b/test-requirements.txt
index 1f71a3c..f2035e7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # 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/python-neutronclient.git@f8e2e42835e6f3bc0ab321d3a7c25e0109ff5e0a#egg=python-neutronclient
+python-neutronclient>=2.3.0,<2.3.10
 hacking>=0.8.0,<0.9
 
 cliff-tablib>=1.0