diff --git a/doc/requirements.txt b/doc/requirements.txt
index 4e0cd0cf3..16c237736 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,8 +1,8 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-sphinx>=1.6.2 # BSD
-openstackdocstheme>=1.17.0 # Apache-2.0
+sphinx!=1.6.6,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 
 doc8>=0.6.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 8f17cc4c3..a1cf1c416 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -75,12 +75,12 @@ database =
 test =
   pydotplus>=2.0.2 # MIT License
   hacking<0.11,>=0.10.0
-  oslotest>=1.10.0 # Apache-2.0
+  oslotest>=3.2.0 # Apache-2.0
   mock>=2.0.0 # BSD
   testtools>=2.2.0 # MIT
   testscenarios>=0.4 # Apache-2.0/BSD
   doc8>=0.6.0 # Apache-2.0
-  sphinx>=1.6.2 # BSD
+  sphinx!=1.6.6,>=1.6.2 # BSD
 
 [nosetests]
 cover-erase = true