diff --git a/requirements.txt b/requirements.txt
index 692c095..7458ad0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ Django<2.0,>=1.8 # BSD
 django-compressor>=2.0 # MIT
 httplib2>=0.9.1 # MIT
 python-keystoneclient>=3.8.0 # Apache-2.0
-PyYAML>=3.10 # MIT
+PyYAML>=3.12 # MIT
 
 # Watcher-specific requirements
 python-watcherclient>=1.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index e3a2cce..abb7166 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -18,5 +18,5 @@ xvfbwrapper>=0.1.3 #license: MIT
 
 # Doc requirements
 openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx!=1.6.6,<1.7.0,>=1.6.2 # BSD
 reno>=2.5.0 # Apache-2.0