diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 9f12d37518ef807706a879b9ceb160184aab591b..ec964203e9242f4fda71d932abb456ca8dfb2e0e 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -252,7 +252,12 @@ def RunCommonInstanceTests(instance):
   RunTestIf(["instance-console", "rapi"],
             qa_rapi.TestRapiInstanceConsole, instance)
 
-  DOWN_TESTS = ["instance-reinstall", "instance-rename", "instance-grow-disk"]
+  DOWN_TESTS = qa_config.Either([
+    "instance-reinstall",
+    "instance-rename",
+    "instance-grow-disk",
+    ])
+
   # shutdown instance for any 'down' tests
   RunTestIf(DOWN_TESTS, qa_instance.TestInstanceShutdown, instance)