diff --git a/qa/qa-sample.yaml b/qa/qa-sample.yaml
index 75e9e703fe4e3d08fe34ed251a50d15fea277b6d..e196d1e97ae79939390de0f50b561acda0513261 100644
--- a/qa/qa-sample.yaml
+++ b/qa/qa-sample.yaml
@@ -72,6 +72,7 @@ tests:
 # Other settings
 options:
   burnin-instances: 2
+  burnin-disk-template: remote_raid1
 
   # Directory containing QA hooks
   #hooks-dir: hooks/
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 25ebc75b9e84564b574c36d3593f054903821006..245ac681b00f79d1bc92555c328885e9f3eeab8e 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -117,26 +117,30 @@ def TestClusterBurnin():
   """Burnin"""
   master = qa_config.GetMasterNode()
 
+  disk_template = (qa_config.get('options', {}).
+                   get('burnin-disk-template', 'remote_raid1'))
+
   # Get as many instances as we need
   instances = []
   try:
-    num = qa_config.get('options', {}).get('burnin-instances', 1)
-    for _ in xrange(0, num):
-      instances.append(qa_config.AcquireInstance())
-  except qa_error.OutOfInstancesError:
-    print "Not enough instances, continuing anyway."
+    try:
+      num = qa_config.get('options', {}).get('burnin-instances', 1)
+      for _ in xrange(0, num):
+        instances.append(qa_config.AcquireInstance())
+    except qa_error.OutOfInstancesError:
+      print "Not enough instances, continuing anyway."
 
-  if len(instances) < 1:
-    raise qa_error.Error("Burnin needs at least one instance")
+    if len(instances) < 1:
+      raise qa_error.Error("Burnin needs at least one instance")
 
-  # Run burnin
-  try:
     script = qa_utils.UploadFile(master['primary'], '../tools/burnin')
     try:
+      # Run burnin
       cmd = [script,
              '--os=%s' % qa_config.get('os'),
              '--os-size=%s' % qa_config.get('os-size'),
-             '--swap-size=%s' % qa_config.get('swap-size')]
+             '--swap-size=%s' % qa_config.get('swap-size'),
+             '--disk-template=%s' % disk_template]
       cmd += [inst['name'] for inst in instances]
       AssertEqual(StartSSH(master['primary'],
                            utils.ShellQuoteArgs(cmd)).wait(), 0)