diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
index aaed7fdb93..b9e900ec79 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
@@ -1,5 +1,5 @@
 - job:
-    name: 'gate-tripleo-deploy'
+    name: 'check-tripleo-seed-precise'
     node: 'tripleo-precise'
 
     wrappers:
@@ -18,6 +18,46 @@
           export DEVSTACK_GATE_EXERCISES=0
           export GEARDSERVER=192.168.1.1
           export DIB_COMMON_ELEMENTS="stackuser pypi-openstack"
+          export TRIPLEO_TEST=seed
+          function gate_hook {
+              bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
+          }
+          export -f gate_hook
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'logs/$LOG_PATH'
+              source: 'logs/**'
+              keep-hierarchy: false
+              copy-after-failure: true
+      - console-log
+
+- job:
+    name: 'check-tripleo-undercloud-precise'
+    node: 'tripleo-precise'
+
+    wrappers:
+      - timeout:
+          timeout: 125
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export GEARDSERVER=192.168.1.1
+          export DIB_COMMON_ELEMENTS="stackuser pypi-openstack"
+          export TRIPLEO_TEST=undercloud
           function gate_hook {
               bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
           }
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index c88374a0f4..a385f0aa9e 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -231,7 +231,9 @@ jobs:
   - name: gate-tempest-dsvm-neutron-heat-slow
     branch: ^(?!stable/grizzly).*$
     voting: false
-  - name: gate-tripleo-deploy
+  - name: check-tripleo-seed-precise
+    voting: false
+  - name: check-tripleo-undercloud-precise
     voting: false
   - name: check-tempest-dsvm-ironic-nv
     voting: false
@@ -930,7 +932,8 @@ projects:
       - gate-tuskar-pep8
       - gate-tuskar-python26
       - gate-tuskar-python27
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
     gate:
       - gate-tuskar-pep8
       - gate-tuskar-python26
@@ -1378,7 +1381,8 @@ projects:
       - gate-python-tuskarclient-python26
       - gate-python-tuskarclient-python27
       - gate-python-tuskarclient-python33
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
     gate:
       - gate-python-tuskarclient-pep8
       - gate-python-tuskarclient-python26
@@ -1401,7 +1405,8 @@ projects:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
       - gate-diskimage-builder-python27
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
     gate:
       - gate-diskimage-builder-requirements
       - gate-diskimage-builder-pep8
@@ -1516,7 +1521,8 @@ projects:
       - gate-os-apply-config-pep8
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
     gate:
       - gate-os-apply-config-requirements
       - gate-os-apply-config-pep8
@@ -1538,7 +1544,8 @@ projects:
       - gate-os-collect-config-pep8
       - gate-os-collect-config-python26
       - gate-os-collect-config-python27
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
     gate:
       - gate-os-collect-config-requirements
       - gate-os-collect-config-pep8
@@ -1560,7 +1567,8 @@ projects:
       - gate-os-refresh-config-pep8
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
     gate:
       - gate-os-refresh-config-requirements
       - gate-os-refresh-config-pep8
@@ -1910,7 +1918,8 @@ projects:
 
   - name: openstack/tripleo-heat-templates
     check:
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
     gate:
       - gate-noop
     post:
@@ -1922,7 +1931,8 @@ projects:
 
   - name: openstack/tripleo-image-elements
     check:
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
     gate:
       - gate-noop
     post:
@@ -1938,7 +1948,8 @@ projects:
 
   - name: openstack/tripleo-incubator
     check:
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
       - gate-tripleo-incubator-docs
     gate:
       - gate-tripleo-incubator-docs
@@ -2288,7 +2299,8 @@ projects:
       - check-tempest-dsvm-cells-full-havana
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
     gate:
       - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
@@ -2657,7 +2669,8 @@ projects:
 
   - name: openstack-infra/tripleo-ci
     check:
-      - gate-tripleo-deploy
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
     gate:
       - gate-noop