diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index d66d8c3223abdf33bd1971de0d2afb61036ccbfb..5c399e72ccd68e7567ea706be20c8f8cb34607c7 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -77,6 +77,9 @@ def SetupCluster():
   if qa_config.TestEnabled('create-cluster'):
     RunTest(qa_cluster.TestClusterInit)
     RunTest(qa_node.TestNodeAddAll)
+  else:
+    # consider the nodes are already there
+    qa_node.MarkNodeAddedAll()
   if qa_config.TestEnabled('node-info'):
     RunTest(qa_node.TestNodeInfo)
 
diff --git a/qa/qa_node.py b/qa/qa_node.py
index 8d17a4cb3013aaf0d47c332bd8f710eb2866e05b..025683c1c2fd574fdb4b270f41455dfe5009a7d6 100644
--- a/qa/qa_node.py
+++ b/qa/qa_node.py
@@ -66,6 +66,18 @@ def TestNodeAddAll():
       _NodeAdd(node, readd=False)
 
 
+def MarkNodeAddedAll():
+  """Mark all nodes as added.
+
+  This is useful if we don't create the cluster ourselves (in qa).
+
+  """
+  master = qa_config.GetMasterNode()
+  for node in qa_config.get('nodes'):
+    if node != master:
+      node['_added'] = True
+
+
 def TestNodeRemoveAll():
   """Removing all nodes from cluster."""
   master = qa_config.GetMasterNode()