diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index 2a0d1bf95a..6f95f4544a 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -32,6 +32,11 @@ function _heat_set_user {
 }
 
 function create {
+    # run heat_integrationtests instead of tempest smoke before create
+    pushd $BASE_DEVSTACK_DIR/../heat
+    tox -eintegration heat_integrationtests.functional.test_create_update
+    popd
+
     # creates a tenant for the server
     eval $(openstack project create -f shell -c id $HEAT_PROJECT)
     if [[ -z "$id" ]]; then
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 9d05220e1c..3cd057e99f 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -2,3 +2,5 @@ register_project_for_upgrade heat
 register_db_to_save heat
 devstack_localrc base enable_service h-api h-api-cfn h-api-cw h-eng heat tempest ceilometer-alarm-evaluator ceilometer-alarm-notifier ceilometer-anotification
 devstack_localrc target enable_service h-api h-api-cfn h-api-cw h-eng heat tempest ceilometer-alarm-evaluator ceilometer-alarm-notifier ceilometer-anotification
+BASE_RUN_SMOKE=False
+TARGET_RUN_SMOKE=False
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index 527512bde3..9274141b95 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -82,6 +82,12 @@ start_heat
 # Don't succeed unless the services come up
 ensure_services_started heat-api heat-engine heat-api-cloudwatch heat-api-cfn
 
+# run heat_integrationtests instead of tempest smoke after upgrade
+pushd $TARGET_DEVSTACK_DIR/../heat
+source $TARGET_DEVSTACK_DIR/openrc demo demo
+tox -eintegration heat_integrationtests.functional.test_create_update
+popd
+
 set +o xtrace
 echo "*********************************************************************"
 echo "SUCCESS: End $0"