diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml
index 7cc9af1738..3f3f75355e 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml
@@ -363,6 +363,101 @@
           recipients: openstack-qa@lists.openstack.org
 
 
+- job-template:
+    name: 'periodic-tempest-dsvm-savanna-full{branch-designator}'
+    node: '{node}'
+
+    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_TEMPEST_FULL=1
+          export DEVSTACK_GATE_SAVANNA=1
+          export ZUUL_BRANCH={branch-override}
+          unset ZUUL_PROJECT
+          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-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-stable-maint@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-dsvm-savanna-postgres-full{branch-designator}'
+    node: '{node}'
+
+    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_POSTGRES=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_SAVANNA=1
+          export ZUUL_BRANCH={branch-override}
+          unset ZUUL_PROJECT
+          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-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-stable-maint@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-dsvm-savanna-neutron{branch-designator}'
+    node: '{node}'
+
+    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_NEUTRON=1
+          export DEVSTACK_GATE_SMOKE_SERIAL=1
+          export DEVSTACK_SAVANNA=1
+          export ZUUL_BRANCH={branch-override}
+          unset ZUUL_PROJECT
+          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-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-stable-maint@lists.openstack.org
+
+
 - job-group:
     name: devstack-periodic-jobs
     jobs:
@@ -378,3 +473,6 @@
       - 'periodic-tempest-dsvm-all{branch-designator}'
       - 'periodic-tempest-dsvm-coverage{branch-designator}'
       - 'periodic-tempest-dsvm-stress{branch-designator}'
+      - 'periodic-tempest-dsvm-savanna-full{branch-designator}'
+      - 'periodic-tempest-dsvm-savanna-postgres-full{branch-designator}'
+      - 'periodic-tempest-dsvm-savanna-neutron{branch-designator}'
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 8ed7c9f77d..e53ec6f71c 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
@@ -544,6 +544,101 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
+    node: '{node}'
+
+    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_TEMPEST_FULL=1
+          export DEVSTACK_SAVANNA=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          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-dsvm-savanna-postgres-full{branch-designator}'
+    node: '{node}'
+
+    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_TEMPEST_FULL=1
+          export DEVSTACK_GATE_POSTGRES=1
+          export DEVSTACK_GATE_SAVANNA=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          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-dsvm-savanna-neutron{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 120
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_SMOKE_SERIAL=1
+          export DEVSTACK_GATE_SAVANNA=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          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-group:
     name: devstack-jobs
     jobs:
@@ -564,3 +659,6 @@
       - '{pipeline}-tempest-dsvm-heat-slow{branch-designator}'
       - '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}'
       - '{pipeline}-grenade-dsvm'
+      - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
+      - '{pipeline}-tempest-dsvm-savanna-postgres-full{branch-designator}'
+      - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index af74c4d37b..91030ccc41 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -271,6 +271,12 @@ jobs:
     voting: false
   - name: gate-savanna-pylint
     voting: false
+  - name: ^(gate|check)-tempest-dsvm-savanna-full$
+    voting: false
+  - name: ^(gate|check)-tempest-dsvm-savanna-postgres-full$
+    voting: false
+  - name: ^(gate|check)-tempest-dsvm-savanna-neutron$
+    voting: false
   - name: gate-marconi-python33
     voting: false
   - name: gate-python-ceilometerclient-python33
@@ -2571,12 +2577,18 @@ projects:
       - gate-savanna-python26
       - gate-savanna-python27
       - gate-savanna-requirements
+      - check-tempest-dsvm-savanna-full
+      - check-tempest-dsvm-savanna-postgres-full
+      - check-tempest-dsvm-savanna-neutron
     gate:
       - gate-savanna-docs
       - gate-savanna-pep8
       - gate-savanna-python26
       - gate-savanna-python27
       - gate-savanna-requirements
+      - gate-tempest-dsvm-savanna-full
+      - gate-tempest-dsvm-savanna-postgres-full
+      - gate-tempest-dsvm-savanna-neutron
     post:
       - savanna-docs
       - savanna-branch-tarball