diff --git a/HACKING.rst b/HACKING.rst
index cd3c49c..3392185 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,4 @@
 openstack Style Commandments
-===============================================
+============================
 
 Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 0e9ec26..0b5b860 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -1,6 +1,6 @@
-============================================
- mistral-tempest-plugin Release Notes
-============================================
+====================================
+mistral-tempest-plugin Release Notes
+====================================
 
 .. toctree::
    :maxdepth: 1
diff --git a/releasenotes/source/unreleased.rst b/releasenotes/source/unreleased.rst
index cd22aab..875030f 100644
--- a/releasenotes/source/unreleased.rst
+++ b/releasenotes/source/unreleased.rst
@@ -1,5 +1,5 @@
-==============================
- Current Series Release Notes
-==============================
+============================
+Current Series Release Notes
+============================
 
 .. release-notes::
diff --git a/test-requirements.txt b/test-requirements.txt
index b50038a..40f3097 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,9 @@
 
 hacking>=1.1.0,<1.2.0 # Apache-2.0
 
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+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
+
 # releasenotes
 reno>=2.5.0 # Apache-2.0