diff --git a/requirements.txt b/requirements.txt
index 2333ee4c80..3dac8e942b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 alembic>=0.8.10 # MIT
 Babel!=2.4.0,>=2.3.4 # BSD
-eventlet!=0.18.3,>=0.18.2 # MIT
+eventlet!=0.18.3,<0.21.0,>=0.18.2 # MIT
 greenlet>=0.3.2 # MIT
 lxml!=3.7.0,>=2.3 # BSD
 netaddr!=0.7.16,>=0.7.13 # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index b0a29df710..aa099b2229 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -23,7 +23,7 @@ psycopg2>=2.5 # LGPL/ZPL
 
 python-subunit>=0.0.18 # Apache-2.0/BSD
 requests-mock>=1.1 # Apache-2.0
-sphinx>=1.5.1 # BSD
+sphinx!=1.6.1,>=1.5.1 # BSD
 os-api-ref>=1.0.0 # Apache-2.0
 os-testr>=0.8.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD