diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index aa52d00d8a5df9341fdd535a4e74b6b0f2758f1d..94518128def47432db11da757bc920a71bd789bb 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -490,6 +490,8 @@ def RunQa():
         snode = qa_config.AcquireNode(exclude=pnode)
         try:
           instance = RunTest(func, pnode, snode)
+          RunTestIf("haskell-confd", qa_node.TestNodeListDrbd, pnode)
+          RunTestIf("haskell-confd", qa_node.TestNodeListDrbd, snode)
           RunCommonInstanceTests(instance)
           RunGroupListTests()
           RunTest(qa_group.TestAssignNodesIncludingSplit,
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 158de29240aa43863e89a77b32811dbd4ceb8317..dc033acc32bf4ae8184b33dd4ba7b4a82136a1dd 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -95,6 +95,8 @@
     "cluster-redist-conf": true,
     "cluster-repair-disk-sizes": true,
 
+    "haskell-confd": true,
+
     "group-list": true,
     "group-rwops": true,
 
diff --git a/qa/qa_node.py b/qa/qa_node.py
index 9f75f7d1e023a468410274a784619123da19d8f2..647af19078e7cd59a2a274c5dfcebaf6cff558d5 100644
--- a/qa/qa_node.py
+++ b/qa/qa_node.py
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2007, 2011 Google Inc.
+# Copyright (C) 2007, 2011, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -417,3 +417,8 @@ def TestNodeList():
 def TestNodeListFields():
   """gnt-node list-fields"""
   qa_utils.GenericQueryFieldsTest("gnt-node", query.NODE_FIELDS.keys())
+
+
+def TestNodeListDrbd(node):
+  """gnt-node list-drbd"""
+  AssertCommand(["gnt-node", "list-drbd", node["primary"]])