diff --git a/test/ganeti.opcodes_unittest.py b/test/ganeti.opcodes_unittest.py
index 65c515e26308a3f686ce860f4ade1d589dcf915d..ff52381f945ee995a05ec4ca30140eb6dc3891a2 100755
--- a/test/ganeti.opcodes_unittest.py
+++ b/test/ganeti.opcodes_unittest.py
@@ -87,6 +87,34 @@ class TestOpcodes(unittest.TestCase):
     else:
       self.assertEqual("OP_%s" % summary, op.OP_ID)
 
+  def testSummary(self):
+    class _TestOp(opcodes.OpCode):
+      OP_ID = "OP_TEST"
+      OP_DSC_FIELD = "data"
+      OP_PARAMS = [
+        ("data", ht.NoDefault, ht.TString),
+        ]
+
+    self.assertEqual(_TestOp(data="").Summary(), "TEST()")
+    self.assertEqual(_TestOp(data="Hello World").Summary(),
+                     "TEST(Hello World)")
+    self.assertEqual(_TestOp(data="node1.example.com").Summary(),
+                     "TEST(node1.example.com)")
+
+  def testListSummary(self):
+    class _TestOp(opcodes.OpCode):
+      OP_ID = "OP_TEST"
+      OP_DSC_FIELD = "data"
+      OP_PARAMS = [
+        ("data", ht.NoDefault, ht.TList),
+        ]
+
+    self.assertEqual(_TestOp(data=["a", "b", "c"]).Summary(),
+                     "TEST(a,b,c)")
+    self.assertEqual(_TestOp(data=["a", None, "c"]).Summary(),
+                     "TEST(a,None,c)")
+    self.assertEqual(_TestOp(data=[1, 2, 3, 4]).Summary(), "TEST(1,2,3,4)")
+
   def testOpId(self):
     self.assertFalse(utils.FindDuplicates(cls.OP_ID
                                           for cls in opcodes._GetOpList()))