diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml
index 28b2196b6d..ce614239b3 100644
--- a/jenkins/jobs/macros.yaml
+++ b/jenkins/jobs/macros.yaml
@@ -170,7 +170,7 @@
 - builder:
     name: pylint
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-pylint.sh"
+      - shell: "/usr/local/jenkins/slave_scripts/run-pylint.sh {env}"
 
 - builder:
     name: npm-install
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 1a6776aa17..e1e5b85147 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -420,11 +420,13 @@
 
     jobs:
       - python-jobs
+      - python-constraints-jobs
       - python-juno-bitrot-jobs
       - python-kilo-bitrot-jobs
       - python-liberty-bitrot-jobs
       - openstack-publish-jobs
       - gate-{name}-pylint
+      - gate-{name}-pylint-constraints
       - translation-jobs
       - translation-jobs-liberty
       - gate-rally-dsvm-{name}
diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml
index 8f8867e928..41274b8500 100644
--- a/jenkins/jobs/python-jobs.yaml
+++ b/jenkins/jobs/python-jobs.yaml
@@ -87,13 +87,27 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - pylint
+      - pylint:
+          env: pylint
 
     publishers:
       - zuul-swift-upload-console-log
 
     node: '{node}'
 
+- job-template:
+    name: 'gate-{name}-pylint-constraints'
+
+    builders:
+      - revoke-sudo
+      - gerrit-git-prep
+      - pylint:
+          env: pylint-constraints
+
+    publishers:
+      - zuul-swift-upload-console-log
+
+    node: '{node}'
 
 - job-template:
     name: 'gate-{name}-python26'
diff --git a/jenkins/scripts/run-pylint.sh b/jenkins/scripts/run-pylint.sh
index 2078e2425c..fdcaefe5c3 100755
--- a/jenkins/scripts/run-pylint.sh
+++ b/jenkins/scripts/run-pylint.sh
@@ -14,7 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+venv=${1:-pylint}
+export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt
+
 set -o pipefail
-tox -v -epylint | tee pylint.txt
+tox -v -e$venv | tee pylint.txt
 set +o pipefail
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d307e22002..3e4fcd7fb3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1182,7 +1182,7 @@ jobs:
     branch: ^(?!stable/(?:juno|kilo)).*$
     voting: false
 
-  - name: gate-cinder-pylint
+  - name: ^gate-cinder-pylint(-constraints)?$
     voting: false
 
   - name: gate-cinderclient-dsvm-functional
@@ -2022,7 +2022,7 @@ jobs:
   # End of Python 2.6 depreciation
 
   # Python 3.4 jobs
-  - name: gate-cinder-python34
+  - name: ^gate-cinder-python34(-constraints)?$
     branch: ^(?!stable/(?:juno|kilo)).*$
 
   - name: gate-keystone-python34
@@ -2156,6 +2156,9 @@ jobs:
   - name: gate-nova-tox-functional-constraints
     voting: false
 
+  - name: ^gate-cinder-.*-constraints$
+    voting: false
+
   - name: gate-python-fuelclient-python34
     branch: ^(?!stable/(?:6\.1|7.0)).*$
 
@@ -3977,6 +3980,11 @@ projects:
       - gate-tempest-dsvm-full-drbd-devstack-nv
       - gate-tempest-dsvm-full-lio
       - gate-tempest-dsvm-full-bdd-nv
+      - gate-cinder-python27-constraints
+      - gate-cinder-python34-constraints
+      - gate-cinder-docs-constraints
+      - gate-cinder-pep8-constraints
+      - gate-cinder-pylint-constraints
     gate:
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-full-ceph