diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 23586ce1f9888cd3ee7023f72e0bb4d0ead7c8f9..8247a0dea9b96e05728708439a36c20f4f6fd3b4 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -213,15 +213,20 @@ def RunCommonInstanceTests(instance):
   if qa_config.TestEnabled('tags'):
     RunTest(qa_tags.TestInstanceTags, instance)
 
+  if qa_rapi.Enabled():
+    RunTest(qa_rapi.TestInstance, instance)
+
+
+def RunCommonNodeTests():
+  """Run a few common node tests.
+
+  """
   if qa_config.TestEnabled('node-volumes'):
     RunTest(qa_node.TestNodeVolumes)
 
   if qa_config.TestEnabled("node-storage"):
     RunTest(qa_node.TestNodeStorage)
 
-  if qa_rapi.Enabled():
-    RunTest(qa_rapi.TestInstance, instance)
-
 
 def RunExportImportTests(instance, pnode, snode):
   """Tries to export and import the instance.
@@ -363,6 +368,8 @@ def main():
   if qa_config.TestEnabled('tags'):
     RunTest(qa_tags.TestClusterTags)
 
+  RunCommonNodeTests()
+
   pnode = qa_config.AcquireNode(exclude=qa_config.GetMasterNode())
   try:
     if qa_config.TestEnabled('node-readd'):