diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 8247a0dea9b96e05728708439a36c20f4f6fd3b4..79a5d6e2be130d18f0054db60e54e350ca34f27c 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -101,11 +101,13 @@ def SetupCluster(rapi_user, rapi_secret):
   if qa_config.TestEnabled('create-cluster'):
     RunTest(qa_cluster.TestClusterInit, rapi_user, rapi_secret)
     RunTest(qa_node.TestNodeAddAll)
-    RunTest(qa_cluster.TestJobqueue)
   else:
     # consider the nodes are already there
     qa_node.MarkNodeAddedAll()
 
+  if qa_config.TestEnabled("test-jobqueue"):
+    RunTest(qa_cluster.TestJobqueue)
+
   # enable the watcher (unconditionally)
   RunTest(qa_daemon.TestResumeWatcher)
 
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 824cf7865998fd05e46216e3542f0efda3bd4d2d..3b1be0df60ecb7e6258f4ffb8fb15077f7508134 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -38,6 +38,7 @@
     "os": true,
     "tags": true,
     "rapi": true,
+    "test-jobqueue": true,
 
     "create-cluster": true,
     "cluster-verify": true,