diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5d111af..1465cd4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -48,12 +48,13 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # openstackdocstheme options
-repository_name = 'openstack/tempest-stress'
-bug_project = 'tempest'
-bug_tag = 'doc'
+openstackdocs_repo_name = 'openstack/tempest-stress'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'tempest'
+openstackdocs_bug_tag = 'doc'
 
 # -- Options for HTML output --------------------------------------------------
 
diff --git a/test-requirements.txt b/test-requirements.txt
index fe2c1d1..2ceba7c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,8 +7,8 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0
 coverage>=3.6 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=2.0.0 # BSD
-openstackdocstheme>=2.0.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT