diff --git a/plone/app/discussion/tests/test_comments_viewlet.py b/plone/app/discussion/tests/test_comments_viewlet.py
index 465f923..a3ad64d 100644
--- a/plone/app/discussion/tests/test_comments_viewlet.py
+++ b/plone/app/discussion/tests/test_comments_viewlet.py
@@ -74,7 +74,7 @@ class TestCommentForm(PloneTestCase):
         commentForm = getMultiAdapter((self.context, request), 
                                       name=u"comment-form")
         commentForm.update()
-        data, errors = commentForm.extractData() # pylint: disable-msgs=W0612
+        data, errors = commentForm.extractData() # pylint: disable-msg=W0612
         
         self.assertEquals(len(errors), 1)
         self.failIf(commentForm.handleComment(commentForm, "foo"))
@@ -86,7 +86,7 @@ class TestCommentForm(PloneTestCase):
         commentForm = getMultiAdapter((self.context, request), 
                                       name=u"comment-form")
         commentForm.update()
-        data, errors = commentForm.extractData() # pylint: disable-msgs=W0612
+        data, errors = commentForm.extractData() # pylint: disable-msg=W0612
 
         self.assertEquals(len(errors), 0)
         self.failIf(commentForm.handleComment(commentForm, "foo"))
@@ -115,7 +115,7 @@ class TestCommentForm(PloneTestCase):
         commentForm = getMultiAdapter((self.context, request), 
                                       name=u"comment-form")
         commentForm.update()
-        data, errors = commentForm.extractData() # pylint: disable-msgs=W0612
+        data, errors = commentForm.extractData() # pylint: disable-msg=W0612
         
         # No form errors, but raise unauthorized because discussion is not
         # allowed
@@ -151,7 +151,7 @@ class TestCommentForm(PloneTestCase):
         commentForm = getMultiAdapter((self.context, request), 
                                       name=u"comment-form")
         commentForm.update()
-        data, errors = commentForm.extractData() # pylint: disable-msgs=W0612
+        data, errors = commentForm.extractData() # pylint: disable-msg=W0612
         
         self.assertEquals(len(errors), 0)
         self.assertRaises(Unauthorized,
@@ -238,7 +238,7 @@ class TestCommentsViewlet(PloneTestCase):
         conversation.addComment(comment)
         conversation.addComment(comment)
         replies = self.viewlet.get_replies()
-        self.assertEquals(sum(1 for w in replies), # pylint: disable-msgs=W0612
+        self.assertEquals(sum(1 for w in replies), # pylint: disable-msg=W0612
                           2) 
         replies = self.viewlet.get_replies()
         replies.next()
@@ -251,7 +251,7 @@ class TestCommentsViewlet(PloneTestCase):
         comment.text = 'Comment text'
         conversation = IConversation(self.portal.doc1)
         c1 = conversation.addComment(comment)
-        self.assertEquals(sum(1 for w in # pylint: disable-msgs=W0612
+        self.assertEquals(sum(1 for w in # pylint: disable-msg=W0612
                               self.viewlet.get_replies(workflow_actions=True)), 
                               1) 
         # Enable moderation workflow