diff --git a/devstack/lib/heat b/devstack/lib/heat
index caed12f984..82e88e6c33 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -442,6 +442,15 @@ function create_heat_accounts {
     fi
 }
 
+# configure_tempest_for_heat()
+# NOTE (gmann): Configure all the Tempest setting for Heat service in
+# this function.
+function configure_tempest_for_heat {
+    if is_service_enabled tempest; then
+        iniset $TEMPEST_CONFIG service_available heat True
+    fi
+}
+
 # Restore xtrace
 $_XTRACE_HEAT
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aa2dcdae36..ae919b6bb5 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -35,6 +35,10 @@ if is_heat_enabled; then
         # Start the heat API and heat taskmgr components
         echo_summary "Starting heat"
         start_heat
+
+    elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
+        echo_summary "Configuring Tempest for Heat"
+        configure_tempest_for_heat
     fi
 
     if [[ "$1" == "unstack" ]]; then