diff --git a/requirements.txt b/requirements.txt
index f1e6383c..93ee93bc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,5 +3,5 @@
 # process, which may cause wedges in the gate later.
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
-flake8>=2.6.0,<2.7.0 # MIT
-six>=1.9.0 # MIT
+flake8<2.7.0,>=2.6.0 # MIT
+six>=1.10.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 5daea37c..ed96fc90 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,12 +4,12 @@
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0.0 # BSD
-python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.6.2 # BSD
-openstackdocstheme>=1.17.0 # Apache-2.0
+python-subunit>=1.0.0 # Apache-2.0/BSD
+sphinx!=1.6.6,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
-testtools>=1.4.0 # MIT
+testtools>=2.2.0 # MIT
 
 # hacking doesn't use this anywhere, but nova imports this in nova/__init__.py
 # since eventlet is such a common universal import, add it to the hacking test