diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..db5e1a5
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,6 @@
+- project:
+    templates:
+      - openstack-lower-constraints-jobs
+      - openstack-python-jobs-neutron
+      - openstack-python36-jobs
+      - check-requirements
diff --git a/lower-constraints.txt b/lower-constraints.txt
new file mode 100644
index 0000000..1ea329c
--- /dev/null
+++ b/lower-constraints.txt
@@ -0,0 +1,14 @@
+coverage==4.0
+hacking==0.12.0
+mock==2.0.0
+neutron-lib==1.25.0
+openstackdocstheme==1.18.1
+os-testr==1.0.0
+oslotest==3.2.0
+pbr==4.0.0
+python-subunit==1.0.0
+reno==2.5.0
+Sphinx==1.6.5
+stestr==2.0.0
+tempest==17.1.0
+testtools==2.2.0
diff --git a/requirements.txt b/requirements.txt
index 4b10d77..08e435f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,5 +2,5 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
-neutron-lib>=1.13.0 # Apache-2.0
+pbr>=4.0.0 # Apache-2.0
+neutron-lib>=1.25.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index faef5ca..25f0ec6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,7 +17,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.3
-    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.6
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index a6347fc..a5f94fe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py35,py27,pep8,docs
+envlist = py36,py27,pep8,docs
 skipsdist = True
 
 
@@ -93,3 +93,11 @@ basepython = python3
 # B602 subprocess_popen_with_shell_equals_true - removed when fixed
 # B605 start_process_with_a_shell - remove when fixed
 commands = bandit -r vmware_nsx_tempest_plugin -n 5 -s B108,B602,B605 -ll
+
+[testenv:lower-constraints]
+basepython = python3
+deps =
+  -c{toxinidir}/lower-constraints.txt
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/doc/requirements.txt
+  -r{toxinidir}/requirements.txt