diff --git a/requirements.txt b/requirements.txt
index 21abb554..83b6f95b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,4 +7,3 @@ pbr>=1.8 # Apache-2.0
 PyYAML>=3.10.0 # MIT
 flake8<2.6.0,>=2.5.4 # MIT
 six>=1.9.0 # MIT
-oslosphinx>=4.7.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index f352c6d8..45b6e499 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -42,7 +42,8 @@ mapping_file = babel.cfg
 output_file = diskimage_builder/locale/diskimage_builder.pot
 
 [pbr]
-warnerrors = True
+# TODO(jaegerandi): Set to True once pbr 1.11.0 is out.
+warnerrors = False
 
 [update_catalog]
 domain = diskimage_builder
diff --git a/test-requirements.txt b/test-requirements.txt
index a30316a7..931ecaad 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 
 # Doc requirements
-sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+sphinx>=1.5.1 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 
 # releasenotes