diff --git a/doc/source/conf.py b/doc/source/conf.py
index f8ae368a14..71c7697bb2 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -28,7 +28,8 @@ sys.path.insert(0, os.path.abspath('../..'))
 extensions = [
     'sphinx.ext.autodoc',
     'sphinxcontrib.blockdiag',
-    'sphinxcontrib.programoutput'
+    'sphinxcontrib.programoutput',
+    'oslosphinx'
 ]
 #extensions = ['sphinx.ext.intersphinx']
 #intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None)}
diff --git a/test-requirements.txt b/test-requirements.txt
index baf6cad0f5..eea1d691ef 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,5 +11,6 @@ python-subunit
 testrepository>=0.0.17
 testtools>=0.9.32
 sphinxcontrib-programoutput
+oslosphinx
 mock
 PyMySQL