diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index d87761378639cbf7de717c9e9f6354bc55528eac..f05c30ae433401378008a0c579440ec882e7316c 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -90,14 +90,10 @@ def RunClusterTests():
     RunTest(qa_cluster.TestClusterVerify)
 
   if qa_config.TestEnabled('cluster-info'):
+    RunTest(qa_cluster.TestClusterVersion)
     RunTest(qa_cluster.TestClusterInfo)
-
-  if qa_config.TestEnabled('cluster-getmaster'):
     RunTest(qa_cluster.TestClusterGetmaster)
 
-  if qa_config.TestEnabled('cluster-version'):
-    RunTest(qa_cluster.TestClusterVersion)
-
   if qa_config.TestEnabled('cluster-copyfile'):
     RunTest(qa_cluster.TestClusterCopyfile)
 
diff --git a/qa/qa-sample.yaml b/qa/qa-sample.yaml
index fb1cab5818533d8c646bf3104d66d3efa488f5bf..c13fe9c96f135822f0f908f0ccdb85da10beef58 100644
--- a/qa/qa-sample.yaml
+++ b/qa/qa-sample.yaml
@@ -30,8 +30,6 @@ tests:
 
   cluster-verify: True
   cluster-info: True
-  cluster-getmaster: True
-  cluster-version: True
   cluster-burnin: True
   cluster-command: True
   cluster-copyfile: True