diff --git a/requirements.txt b/requirements.txt
index 2990c5809..34d8357ce 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,7 @@ keystonemiddleware>=4.17.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 yaql>=1.1.3 # Apache 2.0 License
 debtcollector>=1.2.0 # Apache-2.0
-cryptography>=1.9,!=2.0 # BSD/Apache-2.0
+cryptography!=2.0,>=1.9 # BSD/Apache-2.0
 
 # For paste.util.template used in keystone.common.template
 Paste>=2.0.2 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 19ba310b9..e711167db 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -24,7 +24,7 @@ PyMySQL>=0.7.6 # MIT License
 psycopg2>=2.6.2 # LGPL/ZPL
 
 # doc build requirements
-sphinx>=1.6.2 # BSD
+sphinx!=1.6.6,>=1.6.2 # BSD
 sphinxcontrib-httpdomain>=1.3.0 # BSD
 reno>=2.5.0 # Apache-2.0
 openstackdocstheme>=1.17.0 # Apache-2.0