diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index 6d56033c76..39c1612b78 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -23,6 +23,32 @@
       - console-log
 
 
+- job:
+    name: check-tempest-devstack-vm-smoke-stable-folsom
+    node: devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 120
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export ZUUL_BRANCH=stable/folsom
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-tempest-devstack-vm-full'
     node: '{node}'
@@ -49,6 +75,33 @@
       - console-log
 
 
+- job-template:
+    name: 'check-tempest-devstack-vm-full-stable-{release}'
+    node: devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job:
     name: gate-tempest-devstack-vm-iad-trial
     node: devstack-precise-iad
@@ -185,6 +238,33 @@
       - console-log
 
 
+- job:
+    name: check-tempest-devstack-vm-cinder-stable-folsom
+    node: devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 90
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_CINDER=1
+          export ZUUL_BRANCH=stable/folsom
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-tempest-devstack-vm-neutron'
     node: '{node}'
@@ -211,6 +291,33 @@
       - console-log
 
 
+- job-template:
+    name: 'check-tempest-devstack-vm-neutron-stable-{release}'
+    node: devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-tempest-devstack-vm-neutron-pg'
     node: '{node}'
@@ -346,6 +453,33 @@
       - console-log
 
 
+- job-template:
+    name: 'check-devstack-vm-cells-stable-{release}'
+    node: devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_CELLS=1
+          export DEVSTACK_GATE_EXERCISES=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-tempest-devstack-vm-cells'
     node: '{node}'
@@ -372,6 +506,33 @@
       - console-log
 
 
+- job-template:
+    name: 'check-tempest-devstack-vm-cells-stable-{release}'
+    node: devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_CELLS=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-tempest-devstack-vm-cells-full'
     node: '{node}'
@@ -398,6 +559,33 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: 'check-tempest-devstack-vm-cells-full-stable-{release}'
+    node: devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_GATE_CELLS=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
 - job-template:
     name: '{pipeline}-tempest-devstack-vm-large-ops'
     node: '{node}'
@@ -770,6 +958,34 @@
       - console-log
 
 
+- job-template:
+    name: 'check-tempest-devstack-vm-postgres-full-stable-{release}'
+    node: devstack-precise-check
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_GATE_POSTGRES=1
+          export ZUUL_BRANCH=stable/{release}
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-grenade-devstack-vm'
     node: '{node}'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 7c6f844d33..2525367444 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -979,6 +979,30 @@
       - devstack-jobs:
           pipeline: check
           node: 'devstack-precise || devstack-precise-check'
+      - 'check-devstack-vm-cells-stable-{release}':
+          release:
+            - grizzly
+            - havana
+      - 'check-tempest-devstack-vm-cells-stable-{release}':
+          release:
+            - grizzly
+            - havana
+      - 'check-tempest-devstack-vm-cells-full-stable-{release}':
+          release:
+            - grizzly
+            - havana
+      - 'check-tempest-devstack-vm-full-stable-{release}':
+          release:
+            - grizzly
+            - havana
+      - 'check-tempest-devstack-vm-neutron-stable-{release}':
+          release:
+            - grizzly
+            - havana
+      - 'check-tempest-devstack-vm-postgres-full-stable-{release}':
+          release:
+            - grizzly
+            - havana
 
 
 - project:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 10fcefa4e5..17a5f7bd29 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -163,6 +163,22 @@ jobs:
     branch: ^(?!stable/(folsom|grizzly)).*$
   - name: ^(gate|check)-swift-devstack-vm-functional$
     branch: ^(?!stable/(folsom|grizzly)).*$
+  - name: check-tempest-devstack-vm-cinder-stable-folsom
+    voting: false
+  - name: check-tempest-devstack-vm-smoke-stable-folsom
+    voting: false
+  - name: check-tempest-devstack-vm-full-stable-grizzly
+    voting: false
+  - name: check-tempest-devstack-vm-neutron-stable-grizzly
+    voting: false
+  - name: check-tempest-devstack-vm-postgres-full-stable-grizzly
+    voting: false
+  - name: check-devstack-vm-cells-stable-grizzly
+    voting: false
+  - name: check-tempest-devstack-vm-cells-stable-grizzly
+    voting: false
+  - name: check-tempest-devstack-vm-cells-full-stable-grizzly
+    voting: false
   - name: gate-nova-pylint
     voting: false
   - name: gate-cinder-pylint
@@ -1619,19 +1635,23 @@ projects:
 
   - name: openstack-infra/devstack-gate
     check:
-      - check-tempest-devstack-vm-smoke
       - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-cinder
       - check-tempest-devstack-vm-postgres-full
       - check-tempest-devstack-vm-neutron
       - gate-tempest-devstack-vm-large-ops
       - gate-tempest-devstack-vm-neutron-large-ops
       - check-grenade-devstack-vm
       - check-swift-devstack-vm-functional
+      - check-tempest-devstack-vm-cinder-stable-folsom
+      - check-tempest-devstack-vm-smoke-stable-folsom
+      - check-tempest-devstack-vm-full-stable-grizzly
+      - check-tempest-devstack-vm-neutron-stable-grizzly
+      - check-tempest-devstack-vm-postgres-full-stable-grizzly
+      - check-devstack-vm-cells-stable-grizzly
+      - check-tempest-devstack-vm-cells-stable-grizzly
+      - check-tempest-devstack-vm-cells-full-stable-grizzly
     gate:
-      - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
       - gate-tempest-devstack-vm-large-ops