diff --git a/requirements.txt b/requirements.txt
index 9ffb88593..9bcfec865 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
 alembic>=0.8.10 # MIT
 Babel!=2.4.0,>=2.3.4 # BSD
 cffi # MIT
-cryptography>=1.6 # BSD/Apache-2.0
+cryptography!=2.0,>=1.6 # BSD/Apache-2.0
 eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
 jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
 oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index fffcd609b..fab806602 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -26,4 +26,4 @@ bandit>=1.1.0 # Apache-2.0
 sphinx>=1.6.2 # BSD
 os-api-ref>=1.0.0 # Apache-2.0
 reno!=2.3.1,>=1.8.0 # Apache-2.0
-openstackdocstheme>=1.11.0 # Apache-2.0
+openstackdocstheme>=1.16.0 # Apache-2.0