diff --git a/requirements.txt b/requirements.txt
index bafeaf040..f6e9f64c9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ futurist>=0.11.0 # Apache-2.0
 oslo.config>=3.9.0 # Apache-2.0
 oslo.context>=2.2.0 # Apache-2.0
 oslo.log>=1.14.0 # Apache-2.0
-oslo.utils>=3.5.0 # Apache-2.0
+oslo.utils>=3.9.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.service>=1.10.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
@@ -33,7 +33,7 @@ PyYAML>=3.1.0 # MIT
 
 # rabbit driver is the default
 # we set the amqp version to ensure heartbeat works
-amqp>=1.4.0 # LGPL
+amqp<2.0,>=1.4.0 # LGPL
 kombu>=3.0.25 # BSD
 pika>=0.10.0 # BSD
 pika-pool>=0.1.3 # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index 4b3164a5f..6f5b25c9b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ hacking<0.11,>=0.10.0
 
 discover # BSD
 fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
-mock>=1.2 # BSD
+mock>=2.0 # BSD
 mox3>=0.7.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
 testrepository>=0.0.18 # Apache-2.0/BSD