diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 8918a974a8f40eb1da265512b3e0aca2805c1977..ffb4b806e8cf2b0e68ae9c9b08cef114602428cd 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -250,8 +250,8 @@ def RunGroupListTests():
   """Run tests for listing node groups.
 
   """
-  RunTestIf("group-list", qa_group.TestGroupListDefaultFields)
-  RunTestIf("group-list", qa_group.TestGroupListAllFields)
+  RunTestIf("group-list", qa_group.TestGroupList)
+  RunTestIf("group-list", qa_group.TestGroupListFields)
 
 
 def RunGroupRwTests():
diff --git a/qa/qa_group.py b/qa/qa_group.py
index 4283291627df0e4e65571e668c6714bcc8165e0b..891531e01607fdac80a71f1c27da24770c11482b 100644
--- a/qa/qa_group.py
+++ b/qa/qa_group.py
@@ -20,8 +20,11 @@
 
 
 from ganeti import constants
+from ganeti import query
 
 import qa_config
+import qa_utils
+
 from qa_utils import AssertCommand
 
 
@@ -83,12 +86,11 @@ def TestGroupModify():
     AssertCommand(["gnt-group", "remove", group1])
 
 
-def TestGroupListDefaultFields():
+def TestGroupList():
   """gnt-group list"""
-  AssertCommand(["gnt-group", "list"])
+  qa_utils.GenericQueryTest("gnt-group", query.GROUP_FIELDS.keys())
 
 
-def TestGroupListAllFields():
-  """gnt-group list -o FIELDS"""
-  AssertCommand(["gnt-group", "list", "-o",
-                 "name,uuid,node_cnt,node_list,pinst_cnt,pinst_list"])
+def TestGroupListFields():
+  """gnt-group list-fields"""
+  qa_utils.GenericQueryFieldsTest("gnt-group", query.GROUP_FIELDS.keys())