diff --git a/requirements.txt b/requirements.txt
index cd7693e497..1c209d6ae1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
 alembic>=0.8.10 # MIT
 automaton>=0.5.0 # Apache-2.0
-eventlet!=0.18.3,>=0.18.2 # MIT
+eventlet!=0.18.3,<0.21.0,>=0.18.2 # MIT
 WebOb>=1.7.1 # MIT
 paramiko>=2.0 # LGPLv2.1+
 python-cinderclient>=2.0.1 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 1015aef140..89be49ca42 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -22,7 +22,7 @@ bashate>=0.2 # Apache-2.0
 flake8-import-order==0.11 # LGPLv3
 
 # Doc requirements
-sphinx>=1.5.1 # BSD
+sphinx!=1.6.1,>=1.5.1 # BSD
 sphinxcontrib-pecanwsme>=0.8 # Apache-2.0
 sphinxcontrib-seqdiag # BSD
 openstackdocstheme>=1.5.0 # Apache-2.0