diff --git a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
index 6fd53a31a2..1a86c0be7b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
@@ -29,3 +29,42 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job-template:
+    name: '{pipeline}-heat-dsvm-functional{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 65
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export HEAT_CREATE_TEST_IMAGE=True
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          function post_test_hook {{
+              source /opt/stack/new/devstack/accrc/demo/demo
+              cd /opt/stack/new/heat
+              tox -efunctional
+          }}
+          export -f post_test_hook
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log
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 0214b108c8..913c2e1d99 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -682,6 +682,11 @@
 
     jobs:
       - python-jobs
+      - '{pipeline}-heat-dsvm-functional{branch-designator}':
+          pipeline: check
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
       - python-havana-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 19bd80fe0c..96d8e1d184 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -488,6 +488,9 @@ jobs:
     voting: false
   - name: ^(gate|check)-tempest-dsvm-neutron-heat-slow
     branch: ^(?!stable/havana).*$
+  - name: check-heat-dsvm-functional
+    branch: ^(?!stable/(havana|icehouse)).*$
+    voting: false
   - name: check-tempest-dsvm-ironic-nv
     voting: false
   - name: check-tempest-dsvm-ironic-postgres-nv
@@ -983,6 +986,7 @@ projects:
       - name: integrated-gate
       - name: translation-jobs
     check:
+      - check-heat-dsvm-functional
       - check-devstack-dsvm-cells
       - gate-rally-dsvm-fakevirt-heat
     gate: