diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index a3c20706a73d0a445b965f7b6a9745a3efdb6062..a737e16a15c94a421121eea5101283d42ad6552e 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -98,7 +98,8 @@
     "burnin-disk-template": "drbd",
     "burnin-in-parallel": false,
     "burnin-check-instances": false,
-    "burnin-rename": "xen-test-rename"
+    "burnin-rename": "xen-test-rename",
+    "burnin-reboot": true
   },
 
   "# vim: set syntax=javascript :": null
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 7c0de1976e73f2f1c707f388a7951ddc2fbd629e..1a89d5b73cfaf264d86813c3e773a223df1056a6 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -251,6 +251,7 @@ def TestClusterBurnin():
   parallel = options.get('burnin-in-parallel', False)
   check_inst = options.get('burnin-check-instances', False)
   do_rename = options.get('burnin-rename', '')
+  do_reboot = options.get('burnin-reboot', True)
 
   # Get as many instances as we need
   instances = []
@@ -280,6 +281,8 @@ def TestClusterBurnin():
         cmd.append('--http-check')
       if do_rename:
         cmd.append('--rename=%s' % do_rename)
+      if not do_reboot:
+        cmd.append('--no-reboot')
       cmd += [inst['name'] for inst in instances]
       AssertEqual(StartSSH(master['primary'],
                            utils.ShellQuoteArgs(cmd)).wait(), 0)