diff --git a/doc/source/conf.py b/doc/source/conf.py
index 6f6bfd0..c506539 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -10,7 +10,7 @@ sys.path.insert(0, os.path.abspath('../..'))
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     'sphinx.ext.autodoc',
-    'oslosphinx',
+    'openstackdocstheme',
 ]
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
diff --git a/lower-constraints.txt b/lower-constraints.txt
index cbcd2a9..7612888 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -9,7 +9,7 @@ Jinja2==2.10
 linecache2==1.0.0
 MarkupSafe==1.0
 mccabe==0.6.1
-oslosphinx==4.7.0
+openstackdocstheme==1.18.1
 pbr==2.0.0
 pycodestyle==2.3.1
 pyflakes==1.6.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 070bb01..dd55be5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,5 +5,6 @@ stestr>=2.0.0 # Apache-2.0
 testresources>=2.0.0 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 
-sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0