diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml
index f33e394d..922b3b18 100755
--- a/rally-jobs/rally.yaml
+++ b/rally-jobs/rally.yaml
@@ -606,6 +606,23 @@
         failure_rate:
           max: 0
 
+  HeatStacks.list_stacks_and_resources:
+    -
+      runner:
+        type: "constant"
+        times: 6
+        concurrency: 3
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 3
+        stacks:
+          stacks_per_tenant: 2
+          resources_per_stack: 10
+      sla:
+        failure_rate:
+          max: 0
+
   Authenticate.keystone:
     -
       runner:
diff --git a/samples/tasks/scenarios/heat/list-stack-and-resources.json b/samples/tasks/scenarios/heat/list-stack-and-resources.json
new file mode 100644
index 00000000..a1d1485a
--- /dev/null
+++ b/samples/tasks/scenarios/heat/list-stack-and-resources.json
@@ -0,0 +1,21 @@
+{
+    "HeatStacks.list_stacks_and_resources": [
+        {
+            "runner": {
+                "type": "constant",
+                "times": 10,
+                "concurrency": 1
+            },
+            "context": {
+                "users": {
+                    "tenants": 1,
+                    "users_per_tenant": 1
+                },
+                "stacks": {
+                    "stacks_per_tenant": 2,
+                    "resources_per_stack": 10
+                }
+            }
+        }
+    ]
+}
diff --git a/samples/tasks/scenarios/heat/list-stack-and-resources.yaml b/samples/tasks/scenarios/heat/list-stack-and-resources.yaml
new file mode 100644
index 00000000..1ff45c7d
--- /dev/null
+++ b/samples/tasks/scenarios/heat/list-stack-and-resources.yaml
@@ -0,0 +1,14 @@
+---
+  HeatStacks.list_stacks_and_resources:
+    -
+      runner:
+        type: "constant"
+        times: 10
+        concurrency: 1
+      context:
+        users:
+          tenants: 1
+          users_per_tenant: 1
+        stacks:
+          stacks_per_tenant: 2
+          resources_per_stack: 10
\ No newline at end of file