diff --git a/rally-jobs/extra/resource_group_with_constraint.yaml.template b/rally-jobs/extra/resource_group_with_constraint.yaml.template
new file mode 100644
index 00000000..6eca4bb4
--- /dev/null
+++ b/rally-jobs/extra/resource_group_with_constraint.yaml.template
@@ -0,0 +1,21 @@
+heat_template_version: 2013-05-23
+
+description: Template for testing caching.
+
+parameters:
+  count:
+    type: number
+    default: 40
+  delay:
+    type: number
+    default: 0.3
+
+resources:
+  rg:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: {get_param: count}
+      resource_def:
+          type: OS::Heat::TestResource
+          properties:
+            constraint_prop_secs: {get_param: delay}
diff --git a/rally-jobs/heat.yaml b/rally-jobs/heat.yaml
index 0f3eee02..367a9a35 100644
--- a/rally-jobs/heat.yaml
+++ b/rally-jobs/heat.yaml
@@ -64,6 +64,21 @@
         failure_rate:
           max: 0
 
+    -
+      args:
+        template_path: "~/.rally/extra/resource_group_with_constraint.yaml.template"
+      runner:
+        type: "constant"
+        times: 6
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+      sla:
+        failure_rate:
+          max: 0
+
   HeatStacks.create_check_delete_stack:
     -
       args: