diff --git a/bindep/depends.py b/bindep/depends.py
index e004fe1..3ccd9c4 100644
--- a/bindep/depends.py
+++ b/bindep/depends.py
@@ -234,10 +234,10 @@ class Depends(object):
 
         :param rules: A list of rules, as returned by active_rules.
         :param output_format: The format to print the output in. Currently
-        we support newline format which will print 1 package per line, and
-        csv format which prints a csv list.
+          we support newline format which will print 1 package per line, and
+          csv format which prints a csv list.
         :return: List of all required packages regardless of whether they are
-        missing.
+          missing.
         """
         packages_list = [rule[0] for rule in rules]
         if output_format == 'csv':
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3c40497..c152be5 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -24,9 +24,15 @@ sys.path.insert(0, os.path.abspath('../..'))
 extensions = [
     'sphinx.ext.autodoc',
     'sphinxcontrib.programoutput',
-    'oslosphinx'
+    'openstackdocstheme'
 ]
 
+# Setting for openstackdocstheme
+html_theme = 'openstackdocs'
+repository_name = 'openstack-infra/bindep'
+bug_tag = ''
+use_storyboard = True
+
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
 # text edit cycles.
 # execute "export SPHINX_DEBUG=1" in your terminal to disable
diff --git a/test-requirements.txt b/test-requirements.txt
index 664fc14..21d66a3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,8 +4,8 @@ coverage>=3.6
 fixtures>=0.3.12
 mock>=2.0  # BSD
 python-subunit
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0
-sphinxcontrib-programoutput
 testrepository>=0.0.13
 testtools>=0.9.27
+sphinx>1.6.1  # BSD
+openstackdocstheme>=1.24.1  # Apache-2.0
+sphinxcontrib-programoutput  # BSD license
diff --git a/tox.ini b/tox.ini
index 21e182a..f037afe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,7 @@ commands = {posargs}
 commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.