diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 66234a380..8febc1666 100755
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -24,7 +24,7 @@ extensions = [
     'sphinx.ext.autodoc',
     # 'sphinx.ext.intersphinx',
     'reno.sphinxext',
-    'oslosphinx'
+    'openstackdocstheme'
 ]
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
@@ -41,6 +41,12 @@ master_doc = 'index'
 project = u'vitrage releasenotes'
 copyright = u'2016, Vitrage developers'
 
+# openstackdocstheme options
+repository_name = 'openstack/vitrage'
+bug_project = 'vitrage'
+bug_tag = ''
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
+
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
 
@@ -56,7 +62,7 @@ pygments_style = 'sphinx'
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
 # html_theme_path = ["."]
-# html_theme = '_theme'
+html_theme = 'openstackdocs'
 # html_static_path = ['static']
 
 # Output file base name for HTML help builder.
diff --git a/test-requirements.txt b/test-requirements.txt
index c10f44ae5..e9a6237ae 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,7 +14,6 @@ python-novaclient>=9.0.0 # Apache-2.0
 python-heatclient>=1.6.1 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
 pyzabbix>=0.7.4 # LGPL
-sphinx!=1.6.1,>=1.5.1 # BSD
 oslo.log>=3.22.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 oslo.service>=1.10.0 # Apache-2.0
@@ -34,5 +33,5 @@ reno!=2.3.1,>=1.8.0 # Apache-2.0
 pysnmp>=4.2.3 # BSD
 
 # Doc requirements
-openstackdocstheme>=1.5.0 # Apache-2.0
-oslosphinx>=4.7.0 # Apache-2.0
+openstackdocstheme>=1.11.0 # Apache-2.0
+sphinx>=1.6.2 # BSD