diff --git a/etc/rally/rally.conf.sample b/etc/rally/rally.conf.sample
index bd2df966..5f9e5150 100644
--- a/etc/rally/rally.conf.sample
+++ b/etc/rally/rally.conf.sample
@@ -320,6 +320,26 @@
 # Server unpause poll interval (floating point value)
 #nova_server_unpause_poll_interval = 2.0
 
+# Time to sleep after shelve before polling for status (floating
+# point value)
+#nova_server_shelve_prepoll_delay = 2.0
+
+# Server shelve timeout (floating point value)
+#nova_server_shelve_timeout = 300.0
+
+# Server shelve poll interval (floating point value)
+#nova_server_shelve_poll_interval = 2.0
+
+# Time to sleep after unshelve before polling for status (floating
+# point value)
+#nova_server_unshelve_prepoll_delay = 2.0
+
+# Server unshelve timeout (floating point value)
+#nova_server_unshelve_timeout = 300.0
+
+# Server unshelve poll interval (floating point value)
+#nova_server_unshelve_poll_interval = 2.0
+
 # Time to sleep after image_create before polling for status (floating
 # point value)
 #nova_server_image_create_prepoll_delay = 0.0
diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml
index a4b66cb5..48c7b485 100755
--- a/rally-jobs/rally.yaml
+++ b/rally-jobs/rally.yaml
@@ -1099,6 +1099,25 @@
         failure_rate:
           max: 0
 
+  NovaServers.shelve_and_unshelve_server:
+    -
+      args:
+        flavor:
+            name: "m1.tiny"
+        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.boot_and_rebuild_server:
     -
       args:
diff --git a/samples/tasks/scenarios/nova/shelve-and-unshelve.json b/samples/tasks/scenarios/nova/shelve-and-unshelve.json
new file mode 100644
index 00000000..ffa5c2ca
--- /dev/null
+++ b/samples/tasks/scenarios/nova/shelve-and-unshelve.json
@@ -0,0 +1,26 @@
+{
+    "NovaServers.shelve_and_unshelve_server": [
+        {
+            "args": {
+                "flavor": {
+                    "name": "m1.nano"
+                },
+                "image": {
+                    "name": "^cirros.*uec$"
+                },
+                "force_delete": false
+            },
+            "runner": {
+                "type": "constant",
+                "times": 10,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 3,
+                    "users_per_tenant": 2
+                }
+            }
+        }
+    ]
+}
diff --git a/samples/tasks/scenarios/nova/shelve-and-unshelve.yaml b/samples/tasks/scenarios/nova/shelve-and-unshelve.yaml
new file mode 100644
index 00000000..7bbb3b0b
--- /dev/null
+++ b/samples/tasks/scenarios/nova/shelve-and-unshelve.yaml
@@ -0,0 +1,17 @@
+---
+  NovaServers.shelve_and_unshelve_server:
+    -
+      args:
+        flavor:
+            name: "m1.nano"
+        image:
+            name: "^cirros.*uec$"
+        force_delete: false
+      runner:
+        type: "constant"
+        times: 10
+        concurrency: 2
+      context:
+        users:
+          tenants: 3
+          users_per_tenant: 2