diff --git a/doc/source/conf.py b/doc/source/conf.py
index 0cef1f7c..6cbf48a2 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -38,7 +38,6 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
 # extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc',
-              'sphinx.ext.todo',
               'sphinx.ext.coverage',
               'sphinx.ext.intersphinx',
               'openstackdocstheme',
diff --git a/setup.cfg b/setup.cfg
index 8f4c1d7b..e5e9943a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -44,6 +44,7 @@ paste.filter_factory =
 source-dir = doc/source
 build-dir = doc/build
 all_files = 1
+warning-is-error = 1
 
 [pbr]
 autodoc_tree_index_modules = True