diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3a4cff9..4b4189d 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -39,9 +39,9 @@
 copyright = u'2017, OpenStack Developers'
 
 # openstackdocstheme options
-repository_name = 'openstack/openstack'
-bug_project = 'neutron_tempest_plugin'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/neutron-tempest-plugin'
+openstackdocs_bug_project = 'neutron_tempest_plugin'
+openstackdocs_bug_tag = ''
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -51,7 +51,7 @@
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # -- Options for HTML output --------------------------------------------------
 
diff --git a/neutron_tempest_plugin/api/test_qos_negative.py b/neutron_tempest_plugin/api/test_qos_negative.py
index ada0efa..c069360 100644
--- a/neutron_tempest_plugin/api/test_qos_negative.py
+++ b/neutron_tempest_plugin/api/test_qos_negative.py
@@ -47,3 +47,21 @@
                           self.client.create_qos_policy,
                           'test-policy', 'test policy desc1',
                           False, LONG_TENANT_ID_NG)
+
+    @decorators.attr(type='negative')
+    @decorators.idempotent_id('0e85f3e4-7a93-4187-b847-8f4e835aae1b')
+    def test_update_policy_with_too_long_name(self):
+        policy = self.create_qos_policy(name='test', description='test policy',
+                                        shared=False)
+        self.assertRaises(lib_exc.BadRequest,
+                          self.client.update_qos_policy, policy['id'],
+                          name=LONG_NAME_NG)
+
+    @decorators.attr(type='negative')
+    @decorators.idempotent_id('925c7eaf-474b-4a02-a4ba-76a9f82bc45a')
+    def test_update_policy_with_too_long_description(self):
+        policy = self.create_qos_policy(name='test', description='test policy',
+                                        shared=False)
+        self.assertRaises(lib_exc.BadRequest,
+                          self.client.update_qos_policy, policy['id'],
+                          description=LONG_DESCRIPTION_NG)
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 770396a..24a38a4 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -55,9 +55,9 @@
 copyright = u'2017, Neutron Tempest Plugin Developers'
 
 # openstackdocstheme options
-repository_name = 'openstack/neutron-tempest-plugin'
-bug_project = 'neutron'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/neutron-tempest-plugin'
+openstackdocs_bug_project = 'neutron'
+openstackdocs_bug_tag = ''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -89,7 +89,7 @@
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
diff --git a/setup.cfg b/setup.cfg
index 544ea90..144569f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,6 +16,8 @@
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
 
 [files]
 packages =
diff --git a/test-requirements.txt b/test-requirements.txt
index 6cff185..6cbe947 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,6 +11,6 @@
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
-openstackdocstheme>=2.0.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
 # releasenotes
-reno>=2.5.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index b20b02d..d4927c5 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -322,8 +322,8 @@
       - ^doc/.*$
       - ^setup.cfg$
       - ^.*\.rst$
-      - ^neutron/locale/.*$
-      - ^neutron/tests/unit/.*$
+      - ^neutron.*/locale/.*$
+      - ^neutron.*/tests/unit/.*$
       - ^tools/.*$
       - ^tox.ini$
 
@@ -488,8 +488,4 @@
       devstack_localrc:
         IPSEC_PACKAGE: strongswan
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_vpnaas) | join(',') }}"
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^neutron_vpnaas/tests/unit/.*$
-      - ^releasenotes/.*$
+    irrelevant-files: *tempest-irrelevant-files