diff --git a/etc/rally/rally.conf.sample b/etc/rally/rally.conf.sample
index 85b3058e..bd2df966 100644
--- a/etc/rally/rally.conf.sample
+++ b/etc/rally/rally.conf.sample
@@ -250,6 +250,16 @@
 # Server reboot poll interval (floating point value)
 #nova_server_reboot_poll_interval = 2.0
 
+# Time to sleep after rebuild before polling for status (floating point
+# value)
+#nova_server_rebuild_prepoll_delay = 0.0
+
+# Server rebuild timeout (floating point value)
+#nova_server_rebuild_timeout = 300.0
+
+# Server rebuild poll interval (floating point value)
+#nova_server_rebuild_poll_interval = 1.0
+
 # Time to sleep after rescue before polling for status (floating point
 # value)
 #nova_server_rescue_prepoll_delay = 2.0
diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml
index 619cf327..ab27062a 100755
--- a/rally-jobs/rally.yaml
+++ b/rally-jobs/rally.yaml
@@ -1134,6 +1134,27 @@
         failure_rate:
           max: 0
 
+  NovaServers.boot_and_rebuild_server:
+    -
+      args:
+        flavor:
+          name: "m1.tiny"
+        from_image:
+          name: {{image_name}}
+        to_image:
+          name: {{image_name}}
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 3
+      context:
+        users:
+          tenants: 3
+          users_per_tenant: 1
+      sla:
+        failure_rate:
+          max: 0
+
   NovaServers.list_servers:
     -
       args:
diff --git a/samples/tasks/scenarios/nova/boot-and-rebuild.json b/samples/tasks/scenarios/nova/boot-and-rebuild.json
new file mode 100644
index 00000000..e6abb6e6
--- /dev/null
+++ b/samples/tasks/scenarios/nova/boot-and-rebuild.json
@@ -0,0 +1,28 @@
+{
+   "NovaServers.boot_and_rebuild_server": [
+        {
+            "args": {
+                "flavor": {
+                    "name": "m1.nano"
+                },
+                "from_image": {
+                    "name": "cirros-0.3.1-x86_64-uec"
+                },
+                "to_image": {
+                    "name": "cirros-0.3.2-x86_64-uec"
+                }
+            },
+            "runner": {
+                "type": "constant",
+                "times": 5,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 1,
+                    "users_per_tenant": 1
+                }
+            }
+        }
+    ]
+}
diff --git a/samples/tasks/scenarios/nova/boot-and-rebuild.yaml b/samples/tasks/scenarios/nova/boot-and-rebuild.yaml
new file mode 100644
index 00000000..3942b490
--- /dev/null
+++ b/samples/tasks/scenarios/nova/boot-and-rebuild.yaml
@@ -0,0 +1,17 @@
+---
+NovaServers.boot_and_rebuild_server:
+- args:
+    flavor:
+      name: m1.nano
+    from_image:
+      name: "cirros-0.3.1-x86_64-uec"
+    to_image:
+      name: "cirros-0.3.2-x86_64-uec"
+  runner:
+    type: constant
+    times: 5
+    concurrency: 2
+  context:
+    users:
+      tenants: 1
+      users_per_tenant: 1