diff --git a/plone/app/discussion/tests/test_catalog.py b/plone/app/discussion/tests/test_catalog.py
index cbe8df6..cbff0cd 100644
--- a/plone/app/discussion/tests/test_catalog.py
+++ b/plone/app/discussion/tests/test_catalog.py
@@ -569,6 +569,3 @@ class NoConversationCatalogTest(unittest.TestCase):
             IAnnotations(self.portal.doc1)
         )
 
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/plone/app/discussion/tests/test_comment.py b/plone/app/discussion/tests/test_comment.py
index 1f39098..d5df9c2 100644
--- a/plone/app/discussion/tests/test_comment.py
+++ b/plone/app/discussion/tests/test_comment.py
@@ -499,6 +499,3 @@ class RepliesTest(unittest.TestCase):
             re_re_re_comment.absolute_url()
         )
 
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/plone/app/discussion/tests/test_comments_viewlet.py b/plone/app/discussion/tests/test_comments_viewlet.py
index aebeecd..5e7d89f 100644
--- a/plone/app/discussion/tests/test_comments_viewlet.py
+++ b/plone/app/discussion/tests/test_comments_viewlet.py
@@ -559,6 +559,3 @@ class TestCommentsViewlet(unittest.TestCase):
         self.assertTrue(
             localized_time in ['Feb 01, 2009 11:32 PM', '2009-02-01 23:32'])
 
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/plone/app/discussion/tests/test_controlpanel.py b/plone/app/discussion/tests/test_controlpanel.py
index a184bb7..1596524 100644
--- a/plone/app/discussion/tests/test_controlpanel.py
+++ b/plone/app/discussion/tests/test_controlpanel.py
@@ -214,6 +214,3 @@ class ConfigurationChangedSubscriberTest(unittest.TestCase):
         # setting itself remains unchanged.
         self.settings.moderation_enabled = True
 
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/plone/app/discussion/tests/test_conversation.py b/plone/app/discussion/tests/test_conversation.py
index 278adb5..29976e8 100644
--- a/plone/app/discussion/tests/test_conversation.py
+++ b/plone/app/discussion/tests/test_conversation.py
@@ -874,6 +874,3 @@ class RepliesTest(unittest.TestCase):
         self.assertEqual(len(replies_to_comment1_1), 1)
         self.assertEqual(len(replies_to_comment2), 1)
 
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/plone/app/discussion/tests/test_indexers.py b/plone/app/discussion/tests/test_indexers.py
index 0701e27..2d4e6da 100644
--- a/plone/app/discussion/tests/test_indexers.py
+++ b/plone/app/discussion/tests/test_indexers.py
@@ -204,6 +204,3 @@ class CommentIndexersTest(unittest.TestCase):
         # object the comment was added to
         self.assertEqual(catalog.in_response_to(self.comment)(), 'Document 1')
 
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/plone/app/discussion/tests/test_moderation_view.py b/plone/app/discussion/tests/test_moderation_view.py
index c821200..1c9cf18 100644
--- a/plone/app/discussion/tests/test_moderation_view.py
+++ b/plone/app/discussion/tests/test_moderation_view.py
@@ -164,6 +164,3 @@ class ModerationBulkActionsViewTest(unittest.TestCase):
         self.assertTrue(comment)
         self.assertEqual(comment, self.comment2)
 
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/plone/app/discussion/tests/test_notifications.py b/plone/app/discussion/tests/test_notifications.py
index 90b6707..548681c 100644
--- a/plone/app/discussion/tests/test_notifications.py
+++ b/plone/app/discussion/tests/test_notifications.py
@@ -276,6 +276,3 @@ class TestModeratorNotificationUnit(unittest.TestCase):
 
         self.assertEqual(len(self.mailhost.messages), 0)
 
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/plone/app/discussion/tests/test_workflow.py b/plone/app/discussion/tests/test_workflow.py
index e54fecd..65361aa 100644
--- a/plone/app/discussion/tests/test_workflow.py
+++ b/plone/app/discussion/tests/test_workflow.py
@@ -275,6 +275,3 @@ class CommentReviewWorkflowTest(unittest.TestCase):
             )
         )
 
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)