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 1a86c0be7b..cb84073ea0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
@@ -50,18 +50,24 @@
           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 pre_test_hook {{
+              cd /opt/stack/new/heat/heat_integrationtests
+              ./pre_test_hook.sh
+          }}
+          export -f pre_test_hook
+
           function post_test_hook {{
-              source /opt/stack/new/devstack/accrc/demo/demo
-              cd /opt/stack/new/heat
-              tox -efunctional
+              cd /opt/stack/new/heat/heat_integrationtests
+              ./post_test_hook.sh
           }}
           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