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 cbf8b56870..2b4bdff099 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
@@ -490,6 +490,7 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_VIRT_DRIVER=ironic
           export DEVSTACK_GATE_IRONIC_DRIVER={deploy_driver}
+          export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK={build-ramdisk}
           export TEMPEST_CONCURRENCY=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -544,6 +545,7 @@
       - devstack-checkout
       - devstack-virtual-ironic:
           postgres: 0
+          build-ramdisk: 1
           deploy_driver: pxe_ssh
           branch-override: '{branch-override}'
     publishers:
@@ -565,6 +567,7 @@
       - devstack-checkout
       - devstack-virtual-ironic:
           postgres: 1
+          build-ramdisk: 1
           deploy_driver: pxe_ssh
           branch-override: '{branch-override}'
 
@@ -572,6 +575,50 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-ironic-agent_ssh{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - devstack-virtual-ironic:
+          postgres: 0
+          build-ramdisk: 0
+          deploy_driver: agent_ssh
+          branch-override: '{branch-override}'
+    publishers:
+      - devstack-logs
+      - console-log
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - devstack-virtual-ironic:
+          postgres: 0
+          build-ramdisk: 1
+          deploy_driver: agent_ssh
+          branch-override: '{branch-override}'
+    publishers:
+      - devstack-logs
+      - console-log
+
 - job-template:
     name: '{pipeline}-tempest-dsvm-zaqar{branch-designator}'
     node: '{node}'
@@ -1480,6 +1527,8 @@
       - '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}'
+      - '{pipeline}-tempest-dsvm-ironic-agent_ssh{branch-designator}'
+      - '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{branch-designator}'
       - '{pipeline}-tempest-dsvm-zaqar{branch-designator}'
       - '{pipeline}-tempest-dsvm-all{branch-designator}'
       - '{pipeline}-tempest-dsvm-coverage{branch-designator}'
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 6113ff1596..9463f5a4c9 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2302,6 +2302,16 @@
           node: 'devstack-precise || devstack-trusty'
           branch-designator: '-nv'
           branch-override: default
+      - '{pipeline}-tempest-dsvm-ironic-agent_ssh{branch-designator}':
+          pipeline: check
+          node: 'devstack-trusty'
+          branch-designator: '-nv'
+          branch-override: default
+      - '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{branch-designator}':
+          pipeline: check
+          node: 'devstack-trusty'
+          branch-designator: '-nv'
+          branch-override: default
 
 - project:
     name: python-ironicclient
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 28ff1b2957..9796f730ea 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -506,6 +506,10 @@ jobs:
     branch: ^(?!stable/havana).*$
   - name: check-tempest-dsvm-ironic-pxe_ssh-postgres-nv
     voting: false
+  - name: check-tempest-dsvm-ironic-agent_ssh-nv
+    voting: false
+  - name: check-tempest-dsvm-ironic-agent_ssh-src-nv
+    voting: false
   - name: ^(gate|check)-tempest-dsvm-cells$
     voting: false
   - name: ^(gate|check)-tempest-dsvm-cells-full$
@@ -1083,6 +1087,7 @@ projects:
     check:
       - check-tempest-dsvm-ironic-pxe_ssh
       - check-tempest-dsvm-ironic-pxe_ssh-postgres
+      - check-tempest-dsvm-ironic-agent_ssh-nv
     check-tripleo:
       - check-tripleo-ironic-undercloud-precise-nonha
     gate:
@@ -2414,6 +2419,7 @@ projects:
       - gate-ironic-python-agent-python26
       - gate-ironic-python-agent-python27
       - gate-ironic-python-agent-buildimage-coreos
+      - check-tempest-dsvm-ironic-agent_ssh-src-nv
     gate:
       - gate-ironic-python-agent-pep8
       - gate-ironic-python-agent-python26