diff --git a/test/ganeti.utils_unittest.py b/test/ganeti.utils_unittest.py
index df5ef2026a6bfb4422037270b1b7c7cb946e3348..5a70af2a6725e88d603d42d95c87013f44a5bb26 100755
--- a/test/ganeti.utils_unittest.py
+++ b/test/ganeti.utils_unittest.py
@@ -2314,5 +2314,15 @@ class TestShellWriter(unittest.TestCase):
     self.assertEqual(buf.getvalue(), "")
 
 
+class TestCommaJoin(unittest.TestCase):
+  def test(self):
+    self.assertEqual(utils.CommaJoin([]), "")
+    self.assertEqual(utils.CommaJoin([1, 2, 3]), "1, 2, 3")
+    self.assertEqual(utils.CommaJoin(["Hello"]), "Hello")
+    self.assertEqual(utils.CommaJoin(["Hello", "World"]), "Hello, World")
+    self.assertEqual(utils.CommaJoin(["Hello", "World", 99]),
+                     "Hello, World, 99")
+
+
 if __name__ == '__main__':
   testutils.GanetiTestProgram()