diff --git a/stack.sh b/stack.sh
index 670d8c3..71c661d 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1272,6 +1272,10 @@
     init_heat
     echo_summary "Starting Heat"
     start_heat
+    if [ "$HEAT_CREATE_TEST_IMAGE" = "True" ]; then
+        echo_summary "Building Heat functional test image"
+        build_heat_functional_test_image
+    fi
 fi