diff --git a/requirements.txt b/requirements.txt
index 7452dca045..7e07eaf7fc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -45,4 +45,4 @@ networkx>=1.8
 Flask<1.0,>=0.10
 netifaces>=0.10.4
 
-cryptography>=0.8.2 # Apache-2.0
+cryptography>=0.9.1 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 2cb0f4b9f9..b829c42ad1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,8 +7,7 @@ cliff>=1.13.0 # Apache-2.0
 coverage>=3.6
 discover
 fixtures>=1.3.1
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 python-subunit>=0.0.18
 ordereddict
 oslotest>=1.7.0 # Apache-2.0