diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh
index f71cf1bc5..d8e0c5939 100755
--- a/scripts/tripleo.sh
+++ b/scripts/tripleo.sh
@@ -807,6 +807,11 @@ function overcloud_sanitytest_create {
                 run_cmd openstack volume create ${SANITYTEST_CONTENT_NAME} --size 1
                 run_cmd openstack volume list
                 ;;
+            "heat_api" )
+                echo "heat_template_version: newton" > /tmp/${SANITYTEST_CONTENT_NAME}.yaml
+                openstack stack create ${SANITYTEST_CONTENT_NAME} --template /tmp/${SANITYTEST_CONTENT_NAME}.yaml
+                openstack stack list
+                ;;
         esac
     done
 }
@@ -827,6 +832,12 @@ function overcloud_sanitytest_check {
             "cinder_api" )
                 run_cmd openstack volume show ${SANITYTEST_CONTENT_NAME}
                 ;;
+            "heat_api" )
+                run_cmd openstack stack show ${SANITYTEST_CONTENT_NAME}
+                # FIXME(shardy): It'd be good to add pre/post upgrade checks
+                # on the actual version, but this is still good for debugging
+                run_cmd openstack orchestration template version list
+                ;;
         esac
     done
 }
@@ -848,6 +859,9 @@ function overcloud_sanitytest_cleanup {
             "cinder_api" )
                 run_cmd openstack volume delete ${SANITYTEST_CONTENT_NAME}
                 ;;
+            "heat_api" )
+                run_cmd openstack stack delete --yes ${SANITYTEST_CONTENT_NAME}
+                ;;
         esac
     done
 }
diff --git a/test-environments/multinode_major_upgrade.yaml b/test-environments/multinode_major_upgrade.yaml
index 97d02636b..426382f50 100644
--- a/test-environments/multinode_major_upgrade.yaml
+++ b/test-environments/multinode_major_upgrade.yaml
@@ -20,6 +20,10 @@ parameter_defaults:
     - OS::TripleO::Services::CinderApi
     - OS::TripleO::Services::CinderScheduler
     - OS::TripleO::Services::CinderVolume
+    - OS::TripleO::Services::HeatApi
+    - OS::TripleO::Services::HeatApiCfn
+    - OS::TripleO::Services::HeatApiCloudwatch
+    - OS::TripleO::Services::HeatEngine
     - OS::TripleO::Services::MySQL
     - OS::TripleO::Services::RabbitMQ
     - OS::TripleO::Services::HAproxy