diff --git a/doc/source/conf.py b/doc/source/conf.py
index 30945d2b3..e37b8b888 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -88,7 +88,7 @@ gen_ref("v3", "Version 3 API Reference",
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'oslosphinx']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/test-requirements.txt b/test-requirements.txt
index 868d84cf5..bc59d2eca 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,5 +6,6 @@ fixtures>=0.3.14
 keyring>=1.6.1,<2.0,>=2.1
 mock>=1.0
 sphinx>=1.1.2,<1.2
+oslosphinx
 testrepository>=0.0.18
 testtools>=0.9.34