diff --git a/requirements.txt b/requirements.txt
index b0761f0..710e105 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,8 +8,8 @@ pecan>=1.0.0
 Paste
 netaddr!=0.7.16,>=0.7.12
 ldap3>=0.9.8.2 # LGPLv3
-requests!=2.8.0,>=2.5.2
+requests>=2.8.1
 stevedore>=1.5.0 # Apache-2.0
-pycadf>=1.1.0
+pycadf!=2.0.0,>=1.1.0
 oslo.config>=2.7.0 # Apache-2.0
-oslo.messaging>2.6.1,!=2.8.0 # Apache-2.0
+oslo.messaging!=2.8.0,>2.6.1 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index f57067b..053681f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,8 +10,8 @@ python-subunit>=0.0.18
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=1.4.0
-requests-mock>=0.6.0 # Apache-2.0
+requests-mock>=0.7.0 # Apache-2.0
 
 # Documentation build requirements
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-oslosphinx>=2.5.0 # Apache-2.0
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0