diff --git a/doc/source/conf.py b/doc/source/conf.py
index a6eb2c4b..cf7629d4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -40,7 +40,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',
               'oslosphinx',
diff --git a/setup.cfg b/setup.cfg
index 232cb187..e9ee1d59 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