diff --git a/heat_integrationtests/cleanup_test_env.sh b/heat_integrationtests/cleanup_test_env.sh
new file mode 100755
index 0000000000..a6a4d66297
--- /dev/null
+++ b/heat_integrationtests/cleanup_test_env.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# This script is executed inside post_test_hook function in devstack gate.
+
+set -ex
+
+source $DEST/devstack/openrc demo demo
+
+# delete the network created
+openstack router remove subnet router1 heat-subnet
+openstack subnet delete heat-subnet
+openstack network delete heat-net
+
+source $DEST/devstack/openrc admin admin
+
+# delete the flavors created
+openstack flavor delete m1.heat_int
+openstack flavor delete m1.heat_micro
+
+# delete the image created
+openstack image delete fedora-heat-test-image
\ No newline at end of file
diff --git a/heat_integrationtests/post_test_hook.sh b/heat_integrationtests/post_test_hook.sh
index e6434f725e..b12f1887f7 100755
--- a/heat_integrationtests/post_test_hook.sh
+++ b/heat_integrationtests/post_test_hook.sh
@@ -19,5 +19,8 @@ set -ex
 export DEST=${DEST:-/opt/stack/new}
 sudo -E $DEST/heat/heat_integrationtests/prepare_test_env.sh
 sudo -E $DEST/heat/heat_integrationtests/prepare_test_network.sh
+
 cd $DEST/tempest
 sudo tempest run --regex heat_integrationtests
+
+sudo -E $DEST/heat/heat_integrationtests/cleanup_test_env.sh