diff --git a/plone/app/discussion/browser/comment.py b/plone/app/discussion/browser/comment.py
index 41beecc..32e11cd 100644
--- a/plone/app/discussion/browser/comment.py
+++ b/plone/app/discussion/browser/comment.py
@@ -14,7 +14,6 @@ from zope.component import getMultiAdapter
 from zope.component import getUtility
 from zope.event import notify
 from zope.lifecycleevent import ObjectModifiedEvent
-from .comments import CommentForm
 
 
 class View(BrowserView):
diff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py
index 272fbb0..fa9baab 100644
--- a/plone/app/discussion/browser/controlpanel.py
+++ b/plone/app/discussion/browser/controlpanel.py
@@ -16,10 +16,13 @@ from zope.component import getUtility
 from zope.component import queryUtility
 from zope.component.hooks import getSite
 
+
 # try/except was added because Configuration Changed Event was moved inside the
 # controlpanel file in the PR #2495 on Products.CMFPlone
 try:
-    from Products.CMFPlone.interfaces.controlpanel import IConfigurationChangedEvent  # noqa: E501
+    from Products.CMFPlone.interfaces.controlpanel import (  # noqa: E501
+        IConfigurationChangedEvent,
+    )
 except ImportError:
     from Products.CMFPlone.interfaces import IConfigurationChangedEvent
 
diff --git a/plone/app/discussion/browser/moderation.py b/plone/app/discussion/browser/moderation.py
index 99d6216..911dfd0 100644
--- a/plone/app/discussion/browser/moderation.py
+++ b/plone/app/discussion/browser/moderation.py
@@ -3,9 +3,9 @@ from AccessControl import getSecurityManager
 from AccessControl import Unauthorized
 from Acquisition import aq_inner
 from Acquisition import aq_parent
+from plone.app.discussion.events import CommentDeletedEvent
 from plone.app.discussion.events import CommentPublishedEvent
 from plone.app.discussion.events import CommentTransitionEvent
-from plone.app.discussion.events import CommentDeletedEvent
 from plone.app.discussion.interfaces import _
 from plone.app.discussion.interfaces import IComment
 from plone.app.discussion.interfaces import IReplies
diff --git a/plone/app/discussion/catalog.py b/plone/app/discussion/catalog.py
index 73c5ab2..a8bab83 100644
--- a/plone/app/discussion/catalog.py
+++ b/plone/app/discussion/catalog.py
@@ -15,6 +15,7 @@ from Products.ZCatalog.interfaces import IZCatalog
 
 import six
 
+
 MAX_DESCRIPTION = 25
 
 # Conversation Indexers
diff --git a/plone/app/discussion/events.py b/plone/app/discussion/events.py
index e2ecc02..85e8439 100644
--- a/plone/app/discussion/events.py
+++ b/plone/app/discussion/events.py
@@ -2,12 +2,12 @@
 """ Custom discussion events
 """
 from plone.app.discussion.interfaces import ICommentAddedEvent
-from plone.app.discussion.interfaces import ICommentModifiedEvent
-from plone.app.discussion.interfaces import ICommentRemovedEvent
-from plone.app.discussion.interfaces import IDiscussionEvent
 from plone.app.discussion.interfaces import ICommentDeletedEvent
+from plone.app.discussion.interfaces import ICommentModifiedEvent
 from plone.app.discussion.interfaces import ICommentPublishedEvent
+from plone.app.discussion.interfaces import ICommentRemovedEvent
 from plone.app.discussion.interfaces import ICommentTransitionEvent
+from plone.app.discussion.interfaces import IDiscussionEvent
 from plone.app.discussion.interfaces import IReplyAddedEvent
 from plone.app.discussion.interfaces import IReplyModifiedEvent
 from plone.app.discussion.interfaces import IReplyRemovedEvent
diff --git a/plone/app/discussion/tests/test_catalog.py b/plone/app/discussion/tests/test_catalog.py
index 98abd9f..facf577 100644
--- a/plone/app/discussion/tests/test_catalog.py
+++ b/plone/app/discussion/tests/test_catalog.py
@@ -3,7 +3,9 @@
 """
 from datetime import datetime
 from plone.app.discussion.interfaces import IConversation
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from Products.CMFCore.utils import getToolByName
diff --git a/plone/app/discussion/tests/test_comment.py b/plone/app/discussion/tests/test_comment.py
index f5f726c..681c7bd 100644
--- a/plone/app/discussion/tests/test_comment.py
+++ b/plone/app/discussion/tests/test_comment.py
@@ -3,7 +3,9 @@ from plone.app.discussion.browser.comment import View
 from plone.app.discussion.interfaces import IComment
 from plone.app.discussion.interfaces import IConversation
 from plone.app.discussion.interfaces import IReplies
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from Products.CMFCore.utils import getToolByName
diff --git a/plone/app/discussion/tests/test_comments_viewlet.py b/plone/app/discussion/tests/test_comments_viewlet.py
index 06b3231..20e66a3 100644
--- a/plone/app/discussion/tests/test_comments_viewlet.py
+++ b/plone/app/discussion/tests/test_comments_viewlet.py
@@ -8,7 +8,9 @@ from plone.app.discussion.browser.comments import CommentForm
 from plone.app.discussion.browser.comments import CommentsViewlet
 from plone.app.discussion.interfaces import IConversation
 from plone.app.discussion.interfaces import IDiscussionSettings
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import login
 from plone.app.testing import logout
 from plone.app.testing import setRoles
diff --git a/plone/app/discussion/tests/test_contentrules.py b/plone/app/discussion/tests/test_contentrules.py
index c05aede..4040335 100644
--- a/plone/app/discussion/tests/test_contentrules.py
+++ b/plone/app/discussion/tests/test_contentrules.py
@@ -5,7 +5,9 @@ from plone.app.discussion.interfaces import IConversation
 from plone.app.discussion.interfaces import IReplies
 from plone.app.discussion.interfaces import IReplyAddedEvent
 from plone.app.discussion.interfaces import IReplyRemovedEvent
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.contentrules.rule.interfaces import IRuleEventType
diff --git a/plone/app/discussion/tests/test_controlpanel.py b/plone/app/discussion/tests/test_controlpanel.py
index 4ad3018..9fbdca9 100644
--- a/plone/app/discussion/tests/test_controlpanel.py
+++ b/plone/app/discussion/tests/test_controlpanel.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from plone.app.discussion.interfaces import IDiscussionSettings
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.registry import Registry
diff --git a/plone/app/discussion/tests/test_conversation.py b/plone/app/discussion/tests/test_conversation.py
index fcf528c..a8efcfd 100644
--- a/plone/app/discussion/tests/test_conversation.py
+++ b/plone/app/discussion/tests/test_conversation.py
@@ -8,7 +8,9 @@ from plone.app.discussion.interfaces import IComment
 from plone.app.discussion.interfaces import IConversation
 from plone.app.discussion.interfaces import IDiscussionSettings
 from plone.app.discussion.interfaces import IReplies
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.app.vocabularies.types import BAD_TYPES
diff --git a/plone/app/discussion/tests/test_events.py b/plone/app/discussion/tests/test_events.py
index 3742c76..c9dc173 100644
--- a/plone/app/discussion/tests/test_events.py
+++ b/plone/app/discussion/tests/test_events.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 from plone.app.discussion.interfaces import IConversation
 from plone.app.discussion.interfaces import IReplies
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from Zope2.App import zcml
diff --git a/plone/app/discussion/tests/test_indexers.py b/plone/app/discussion/tests/test_indexers.py
index 56efebc..9635481 100644
--- a/plone/app/discussion/tests/test_indexers.py
+++ b/plone/app/discussion/tests/test_indexers.py
@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 """Test for the plone.app.discussion indexers
 """
-from DateTime import DateTime
 from datetime import datetime
+from DateTime import DateTime
 from plone.app.discussion import catalog
 from plone.app.discussion.interfaces import IConversation
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.indexer.delegate import DelegatingIndexerFactory
diff --git a/plone/app/discussion/tests/test_moderation_multiple_state_view.py b/plone/app/discussion/tests/test_moderation_multiple_state_view.py
index 72b1db0..0d4445d 100644
--- a/plone/app/discussion/tests/test_moderation_multiple_state_view.py
+++ b/plone/app/discussion/tests/test_moderation_multiple_state_view.py
@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 from plone.app.discussion.browser.moderation import BulkActionsView
-from plone.app.discussion.browser.moderation import DeleteComment
 from plone.app.discussion.browser.moderation import CommentTransition
+from plone.app.discussion.browser.moderation import DeleteComment
 from plone.app.discussion.browser.moderation import View
 from plone.app.discussion.interfaces import IConversation
 from plone.app.discussion.interfaces import IDiscussionSettings
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.registry.interfaces import IRegistry
diff --git a/plone/app/discussion/tests/test_moderation_view.py b/plone/app/discussion/tests/test_moderation_view.py
index 76eddb3..3c14bbd 100644
--- a/plone/app/discussion/tests/test_moderation_view.py
+++ b/plone/app/discussion/tests/test_moderation_view.py
@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 from plone.app.discussion.browser.moderation import BulkActionsView
-from plone.app.discussion.browser.moderation import DeleteComment
 from plone.app.discussion.browser.moderation import CommentTransition
+from plone.app.discussion.browser.moderation import DeleteComment
 from plone.app.discussion.browser.moderation import View
 from plone.app.discussion.interfaces import IConversation
 from plone.app.discussion.interfaces import IDiscussionSettings
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.registry.interfaces import IRegistry
diff --git a/plone/app/discussion/tests/test_notifications.py b/plone/app/discussion/tests/test_notifications.py
index 13f9f6d..fbf792e 100644
--- a/plone/app/discussion/tests/test_notifications.py
+++ b/plone/app/discussion/tests/test_notifications.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 from Acquisition import aq_base
 from plone.app.discussion.interfaces import IConversation
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.registry.interfaces import IRegistry
diff --git a/plone/app/discussion/tests/test_workflow.py b/plone/app/discussion/tests/test_workflow.py
index 9f959fc..963bf11 100644
--- a/plone/app/discussion/tests/test_workflow.py
+++ b/plone/app/discussion/tests/test_workflow.py
@@ -4,7 +4,9 @@
 from AccessControl import Unauthorized
 from plone.app.discussion.interfaces import IConversation
 from plone.app.discussion.interfaces import IDiscussionLayer
-from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING  # noqa
+from plone.app.discussion.testing import (  # noqa
+    PLONE_APP_DISCUSSION_INTEGRATION_TESTING,
+)
 from plone.app.testing import login
 from plone.app.testing import logout
 from plone.app.testing import setRoles
@@ -175,6 +177,7 @@ class CommentOneStateWorkflowTest(unittest.TestCase):
 
     def test_migration(self):
         from plone.app.discussion.upgrades import upgrade_comment_workflows
+
         # Fake permission according to earlier one_comment_workflow.
         self.comment._View_Permission = ('Anonymous',)
         # Anonymous can see the comment.
@@ -319,6 +322,7 @@ class CommentReviewWorkflowTest(unittest.TestCase):
 
     def test_migration(self):
         from plone.app.discussion.upgrades import upgrade_comment_workflows
+
         # Fake permission according to earlier comment_review_workflow.
         self.comment._View_Permission = ('Anonymous',)
         # Anonymous can see the comment.
diff --git a/setup.cfg b/setup.cfg
index 5a698fc..e726c4c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,3 +11,10 @@ universal = 1
 
 [zest.releaser]
 create-wheel = yes
+
+[isort]
+# black compatible Plone isort rules:
+profile = black
+force_alphabetical_sort = True
+force_single_line = True
+lines_after_imports = 2