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 225f9f8aac..1ccf553712 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
@@ -135,6 +135,134 @@
               DEVSTACK_NODE_NAME=${NODE_NAME}
 
 
+- job:
+    name: periodic-tempest-devstack-vm-stable-diablo
+    project-type: freestyle
+    concurrent: true
+    node: devstack-oneiric
+
+    logrotate:
+      daysToKeep: 28
+      numToKeep: -1
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+
+    wrappers:
+      - timeout:
+          timeout: 90
+          fail: true
+      - timestamps
+
+    triggers:
+      - timed: '@daily'
+
+    builders:
+      - trigger-builds:
+          - project: devstack-update-inprogress
+            predefined-parameters:
+              DEVSTACK_NODE_NAME=${NODE_NAME}
+      - shell: |
+          #!/bin/bash -xe
+          #
+          # This job also gates devstack-gate, but in case a previous run fails,
+          # we need to always make sure that we're starting with the latest copy
+          # from master, before we start applying changes to it.  If a previous run
+          # leaves a bad copy of the gate script, we may get stuck.
+          #
+          if [[ ! -e devstack-gate ]]; then
+              git clone https://review.openstack.org/p/openstack-ci/devstack-gate
+          else
+              cd devstack-gate
+              git remote update
+              git reset --hard
+              git clean -x -f
+              git checkout master
+              git reset --hard remotes/origin/master
+              git clean -x -f
+              cd ..
+          fi
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export GERRIT_BRANCH=stable/diablo
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - archive: 
+          artifacts: logs/*
+      - trigger-parameterized-builds:
+          - project: devstack-update-complete
+            when: complete
+            predefined-parameters:
+              DEVSTACK_NODE_NAME=${NODE_NAME}
+
+
+- job:
+    name: periodic-tempest-devstack-vm-stable-essex
+    project-type: freestyle
+    concurrent: true
+    node: devstack-precise
+
+    logrotate:
+      daysToKeep: 28
+      numToKeep: -1
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+
+    wrappers:
+      - timeout:
+          timeout: 90
+          fail: true
+      - timestamps
+
+    triggers:
+      - timed: '@daily'
+
+    builders:
+      - trigger-builds:
+          - project: devstack-update-inprogress
+            predefined-parameters:
+              DEVSTACK_NODE_NAME=${NODE_NAME}
+      - shell: |
+          #!/bin/bash -xe
+          #
+          # This job also gates devstack-gate, but in case a previous run fails,
+          # we need to always make sure that we're starting with the latest copy
+          # from master, before we start applying changes to it.  If a previous run
+          # leaves a bad copy of the gate script, we may get stuck.
+          #
+          if [[ ! -e devstack-gate ]]; then
+              git clone https://review.openstack.org/p/openstack-ci/devstack-gate
+          else
+              cd devstack-gate
+              git remote update
+              git reset --hard
+              git clean -x -f
+              git checkout master
+              git reset --hard remotes/origin/master
+              git clean -x -f
+              cd ..
+          fi
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export GERRIT_BRANCH=stable/essex
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - archive: 
+          artifacts: logs/*
+      - trigger-parameterized-builds:
+          - project: devstack-update-complete
+            when: complete
+            predefined-parameters:
+              DEVSTACK_NODE_NAME=${NODE_NAME}
+
+
 # Called by devstack jobs to alert that they have started so that the
 # jenkins slave they are running on can be disabled.
 - job: