diff --git a/etc/rally/rally.conf.sample b/etc/rally/rally.conf.sample
index 229d6f74..6dd2a897 100644
--- a/etc/rally/rally.conf.sample
+++ b/etc/rally/rally.conf.sample
@@ -193,6 +193,13 @@
 # (floating point value)
 #heat_stack_resume_poll_interval = 1.0
 
+# Time(in sec) to wait for stack to be checked. (floating point value)
+#heat_stack_check_timeout = 3600.0
+
+# Time interval(in sec) between checks when waiting for stack checking.
+# (floating point value)
+#heat_stack_check_poll_interval = 1.0
+
 # Time to sleep after start before polling for status (floating point
 # value)
 #nova_server_start_prepoll_delay = 0.0
diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml
index 9e8cff90..19738b84 100755
--- a/rally-jobs/rally.yaml
+++ b/rally-jobs/rally.yaml
@@ -509,6 +509,22 @@
         failure_rate:
           max: 0
 
+  HeatStacks.create_check_delete_stack:
+    -
+      args:
+        template_path: "/home/jenkins/.rally/extra/random_strings.yaml.template"
+      runner:
+        type: "constant"
+        times: 6
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+      sla:
+        failure_rate:
+          max: 0
+
   HeatStacks.create_update_delete_stack:
     -
       args:
diff --git a/samples/tasks/scenarios/heat/create-check-delete-stack.json b/samples/tasks/scenarios/heat/create-check-delete-stack.json
new file mode 100644
index 00000000..10997895
--- /dev/null
+++ b/samples/tasks/scenarios/heat/create-check-delete-stack.json
@@ -0,0 +1,20 @@
+{
+    "HeatStacks.create_check_delete_stack": [
+        {
+            "args": {
+              "template_path": "templates/random_strings.yaml.template"
+            },
+            "runner": {
+                "type": "constant",
+                "times": 10,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 2,
+                    "users_per_tenant": 3
+                }
+            }
+        }
+    ]
+}
diff --git a/samples/tasks/scenarios/heat/create-check-delete-stack.yaml b/samples/tasks/scenarios/heat/create-check-delete-stack.yaml
new file mode 100644
index 00000000..41bfc382
--- /dev/null
+++ b/samples/tasks/scenarios/heat/create-check-delete-stack.yaml
@@ -0,0 +1,13 @@
+---
+  HeatStacks.create_check_delete_stack:
+    -
+      args:
+        template_path: "templates/random_strings.yaml.template"
+      runner:
+        type: "constant"
+        times: 10
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 3