diff --git a/.zuul.yaml b/.zuul.yaml
index 562cb8ef..e7c200ac 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,3 @@
 - project:
     templates:
-      - openstack-cover-jobs-neutron
-      - tap-as-a-service-tempest-plugin-jobs
\ No newline at end of file
+      - noop-jobs
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..d11414f4
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,7 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+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
+reno>=2.5.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5d5fd5d0..6b2ec56d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -22,8 +22,6 @@ sys.path.insert(0, os.path.abspath('../..'))
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     'sphinx.ext.autodoc',
-    #'sphinx.ext.intersphinx',
-    'oslosphinx'
 ]
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
diff --git a/releasenotes/notes/bp-port-mirroring-sriov-vf-879bc2aa53c2c8d4.yaml b/releasenotes/notes/bp-port-mirroring-sriov-vf-879bc2aa53c2c8d4.yaml
index 5964f086..a4bab2bb 100644
--- a/releasenotes/notes/bp-port-mirroring-sriov-vf-879bc2aa53c2c8d4.yaml
+++ b/releasenotes/notes/bp-port-mirroring-sriov-vf-879bc2aa53c2c8d4.yaml
@@ -5,9 +5,12 @@ prelude: >
 features:
   - |
     [`blueprint port-mirroring-sriov-vf <https://blueprints.launchpad.net/neutron/+spec/port-mirroring-sriov-vf>`_]
+
     * Adds a new TaaS Agent driver (i.e. SRIOV) for Intel i40e driver backend.
+
     * Neutron TaaS Agent is refactored to decouple its tight binding with ovs
-      driver. This prepares the taas agent code-base for addition of a new
-      TaaS Agent driver (SRIOV).
+    driver. This prepares the taas agent code-base for addition of a new
+    TaaS Agent driver (SRIOV).
+
     * Adds a new API extension, i.e. taas-vlan-filter for adding a new
-      attribute (vlan_filter) in tap-flow data model.
+    attribute (vlan_filter) in tap-flow data model.
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index e10af5b8..dd1871f1 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -38,7 +38,6 @@
 # ones.
 extensions = [
     'reno.sphinxext',
-    'oslosphinx',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/tox.ini b/tox.ini
index 618ad61f..83e82458 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,7 +32,6 @@ commands =
 commands = {posargs}
 
 [testenv:cover]
-basepython = python2.7
 setenv =
   {[testenv]setenv}
   PYTHON=coverage run --source neutron_taas --parallel-mode
@@ -47,6 +46,8 @@ commands =
 commands = python setup.py build_sphinx
 
 [testenv:releasenotes]
+deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/stein}
+       -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:debug]