diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index ded3cc5e900bf6bb6638b382eb173047ea0e0fdc..f14153ebeac1915a73dc0ddba587906ecc99f314 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -179,6 +179,13 @@ def RunClusterTests():
     RunTestIf(test, fn)
 
 
+def RunRepairDiskSizes():
+  """Run the repair disk-sizes test.
+
+  """
+  RunTestIf("cluster-repair-disk-sizes", qa_cluster.TestClusterRepairDiskSizes)
+
+
 def RunOsTests():
   """Runs all tests related to gnt-os.
 
@@ -425,13 +432,14 @@ def RunQa():
           RunTest(qa_rapi.TestRapiInstanceRemove, rapi_instance, use_client)
           del rapi_instance
 
-    if qa_config.TestEnabled('instance-add-plain-disk'):
+    if qa_config.TestEnabled("instance-add-plain-disk"):
       instance = RunTest(qa_instance.TestInstanceAddWithPlainDisk, pnode)
       RunCommonInstanceTests(instance)
       RunGroupListTests()
       RunTest(qa_cluster.TestClusterEpo)
       RunExportImportTests(instance, pnode, None)
       RunDaemonTests(instance, pnode)
+      RunRepairDiskSizes()
       RunTest(qa_instance.TestInstanceRemove, instance)
       del instance
 
@@ -456,6 +464,7 @@ def RunQa():
             RunTest(qa_instance.TestInstanceStartup, instance)
           RunExportImportTests(instance, pnode, snode)
           RunHardwareFailureTests(instance, pnode, snode)
+          RunRepairDiskSizes()
           RunTest(qa_instance.TestInstanceRemove, instance)
           del instance
         finally:
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 6e62f80fc6b89a1657ee7bc0d795c5672775d930..73b86b20be6f251559bcb9e65f8c49b2960d041a 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -62,6 +62,8 @@
     "cluster-reserved-lvs": true,
     "cluster-modify": true,
     "cluster-oob": true,
+    "cluster-redist-conf": true,
+    "cluster-repair-disk-sizes": true,
 
     "group-list": true,
     "group-rwops": true,
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 553c6ffc8bc6483d5635ca479850b941370435ed..cca7133a7fe3500b21caba379958573332c75cd5 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -466,3 +466,8 @@ def TestClusterCommand():
 def TestClusterDestroy():
   """gnt-cluster destroy"""
   AssertCommand(["gnt-cluster", "destroy", "--yes-do-it"])
+
+
+def TestClusterRepairDiskSizes():
+  """gnt-cluster repair-disk-sizes"""
+  AssertCommand(["gnt-cluster", "repair-disk-sizes"])