diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index a2a4eb05819883d13cf622b3c6a06294bd676fdc..fc50a09f61f7cc72341bb14c6ecf33fd1c10749e 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -425,6 +425,7 @@ def RunQa():
   try:
     RunTestIf("node-readd", qa_node.TestNodeReadd, pnode)
     RunTestIf("node-modify", qa_node.TestNodeModify, pnode)
+    RunTestIf("delay", qa_cluster.TestDelay, pnode)
   finally:
     qa_config.ReleaseNode(pnode)
 
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index d7f4f3ade349a4a9847d687e91ff35b9587d9b5d..d1af509923ef23beab071710cda170fbe0b0f7fa 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -56,6 +56,7 @@
     "tags": true,
     "rapi": true,
     "test-jobqueue": true,
+    "delay": true,
 
     "create-cluster": true,
     "cluster-verify": true,
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index bd3d737d5d6abc2dd5edad52c227a00d480eab96..a5e4b3f9239ffd3184d6eba80c0800d95a63e951 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -226,6 +226,14 @@ def TestJobqueue():
   AssertCommand(["gnt-debug", "test-jobqueue"])
 
 
+def TestDelay(node):
+  """gnt-debug delay"""
+  AssertCommand(["gnt-debug", "delay", "1"])
+  AssertCommand(["gnt-debug", "delay", "--no-master", "1"])
+  AssertCommand(["gnt-debug", "delay", "--no-master",
+                 "-n", node["primary"], "1"])
+
+
 def TestClusterReservedLvs():
   """gnt-cluster reserved lvs"""
   for fail, cmd in [