diff --git a/doc/source/conf.py b/doc/source/conf.py
index 09867dc6..0f7099a4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -31,9 +31,16 @@ extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
     'sphinx.ext.coverage',
-    'oslosphinx'
+    'openstackdocstheme',
 ]
 
+# openstackdocstheme options
+repository_name = 'openstack/python-troveclient'
+bug_project = 'python-troveclient'
+bug_tag = ''
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
+html_theme = 'openstackdocs'
+
 templates_path = ['_templates']
 
 source_suffix = '.rst'
@@ -47,7 +54,6 @@ exclude_trees = []
 
 pygments_style = 'sphinx'
 
-html_theme = 'default'
 htmlhelp_basename = 'python-troveclientdoc'
 latex_documents = [
     ('index', 'python-troveclient.tex', u'python-troveclient Documentation',
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 847ffac5..53f88e2e 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -30,10 +30,17 @@ import os
 # ones.
 extensions = []
 extensions = [
-    'oslosphinx',
+    'openstackdocstheme',
     'reno.sphinxext',
 ]
 
+
+# openstackdocstheme options
+repository_name = 'openstack/python-troveclient'
+bug_project = 'python-troveclient'
+bug_tag = ''
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -104,7 +111,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'openstackdocs'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
diff --git a/test-requirements.txt b/test-requirements.txt
index b6341960..6920aac7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,6 @@
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 python-openstackclient!=3.10.0,>=3.3.0 # Apache-2.0
 requests-mock>=1.1 # Apache-2.0
@@ -16,3 +15,4 @@ mock>=2.0 # BSD
 httplib2>=0.7.5 # MIT
 pycrypto>=2.6 # Public Domain
 reno!=2.3.1,>=1.8.0 # Apache-2.0
+openstackdocstheme>=1.11.0 # Apache-2.0