diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 3278875a394c2cae991012bb2bc6effdad7d0e29..f6d8fd6ee14af268c6ecfe3d751da3d8c6d74c4f 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -74,11 +74,12 @@ N_FIELDS = ["name", "offline", "master_candidate", "drained",
             "group.uuid",
             ] + _COMMON_FIELDS
 
-G_FIELDS = ["name", "uuid",
-            "alloc_policy",
-            "node_cnt", "node_list",
-            "ctime", "mtime", "serial_no",
-            ]  # "tags" is missing to be able to use _COMMON_FIELDS here.
+G_FIELDS = [
+  "alloc_policy",
+  "name",
+  "node_cnt",
+  "node_list",
+  ] + _COMMON_FIELDS
 
 J_FIELDS = [
   "id", "ops", "status", "summary",
diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index 57836e1c6f2c9b580076009df1cae1e8bfde1593..6584c38e8cd4328569d30c84bed826cacbbd2d28 100755
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -45,6 +45,16 @@ class TestConstants(unittest.TestCase):
     assert "console" in query.INSTANCE_FIELDS
     self.assertTrue("console" not in rlib2.I_FIELDS)
 
+  def testFields(self):
+    checks = {
+      constants.QR_INSTANCE: rlib2.I_FIELDS,
+      constants.QR_NODE: rlib2.N_FIELDS,
+      constants.QR_GROUP: rlib2.G_FIELDS,
+      }
+
+    for (qr, fields) in checks.items():
+      self.assertFalse(set(fields) - set(query.ALL_FIELDS[qr].keys()))
+
 
 class TestParseInstanceCreateRequestVersion1(testutils.GanetiTestCase):
   def setUp(self):