diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 777423ddb408076d659f467339b4ba5634e0b318..a9816129df0d268b34f4c9334bb698e90317b6dc 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -102,6 +102,9 @@ def RunClusterTests():
   if qa_config.TestEnabled('cluster-verify'):
     RunTest(qa_cluster.TestClusterVerify)
 
+  if qa_config.TestEnabled('cluster-reserved-lvs'):
+    RunTest(qa_cluster.TestClusterReservedLvs)
+
   if qa_config.TestEnabled('cluster-rename'):
     RunTest(qa_cluster.TestClusterRename)
 
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 2c56e7fcae6d28824295f4e8a0881a885fd0c7b3..68669c05f168596935ec543bac1a648a3347eb8d 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -48,6 +48,7 @@
     "cluster-renew-crypto": true,
     "cluster-destroy": true,
     "cluster-rename": true,
+    "cluster-reserved-lvs": true,
 
     "node-info": true,
     "node-volumes": true,
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 164fcf1107eb99bd56f2d1906d7f485539bc08bf..13e8f7203445de45ad314ce10939702c5416d3b4 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -136,6 +136,27 @@ def TestClusterVerify():
   AssertEqual(StartSSH(master['primary'],
                        utils.ShellQuoteArgs(cmd)).wait(), 0)
 
+def TestClusterReservedLvs():
+  """gnt-cluster reserved lvs"""
+  master = qa_config.GetMasterNode()
+  CVERIFY = ['gnt-cluster', 'verify']
+  for rcode, cmd in [
+    (0, CVERIFY),
+    (0, ['gnt-cluster', 'modify', '--reserved-lvs', '']),
+    (0, ['lvcreate', '-L1G', '-nqa-test', 'xenvg']),
+    (1, CVERIFY),
+    (0, ['gnt-cluster', 'modify', '--reserved-lvs', 'qa-test,other-test']),
+    (0, CVERIFY),
+    (0, ['gnt-cluster', 'modify', '--reserved-lvs', 'qa-.*']),
+    (0, CVERIFY),
+    (0, ['gnt-cluster', 'modify', '--reserved-lvs', '']),
+    (1, CVERIFY),
+    (0, ['lvremove', '-f', 'xenvg/qa-test']),
+    (0, CVERIFY),
+    ]:
+    AssertEqual(StartSSH(master['primary'],
+                         utils.ShellQuoteArgs(cmd)).wait(), rcode)
+
 
 def TestClusterInfo():
   """gnt-cluster info"""