diff --git a/djangocms_moderation/admin.py b/djangocms_moderation/admin.py
index 460bb8ee..7bb9a223 100644
--- a/djangocms_moderation/admin.py
+++ b/djangocms_moderation/admin.py
@@ -89,7 +89,7 @@ def form_submission(self, obj):
 
         opts = ConfirmationFormSubmission._meta
         url = reverse(
-            "admin:{}_{}_change".format(opts.app_label, opts.model_name),
+            f"admin:{opts.app_label}_{opts.model_name}_change",
             args=[instance.pk],
         )
         return format_html(
@@ -107,6 +107,7 @@ def get_readonly_fields(self, request, obj=None):
         return self.fields
 
 
+@admin.register(ModerationRequestTreeNode)
 class ModerationRequestTreeAdmin(TreeAdmin):
     """
     This admin is purely for the change list of Moderation Requests using the treebeard nodes to
@@ -466,6 +467,7 @@ def _traverse_moderation_nodes(node_item):
         return HttpResponseRedirect(redirect_url)
 
 
+@admin.register(ModerationRequest)
 class ModerationRequestAdmin(admin.ModelAdmin):
     class Media:
         js = ('admin/js/jquery.init.js', 'djangocms_moderation/js/actions.js',)
@@ -813,11 +815,13 @@ def changelist_view(self, request, extra_context=None):
         return tree_node_admin.changelist_view(request, extra_context)
 
 
+@admin.register(Role)
 class RoleAdmin(admin.ModelAdmin):
     list_display = ["name", "user", "group", "confirmation_page"]
     fields = ["name", "user", "group", "confirmation_page"]
 
 
+@admin.register(CollectionComment)
 class CollectionCommentAdmin(admin.ModelAdmin):
     list_display = ["date_created", "message", "author"]
     fields = ["collection", "message", "author"]
@@ -900,6 +904,7 @@ def get_readonly_fields(self, request, obj=None):
             return self.list_display
 
 
+@admin.register(RequestComment)
 class RequestCommentAdmin(admin.ModelAdmin):
     list_display = ["date_created", "message", "get_author"]
     fields = ["moderation_request", "message", "author"]
@@ -990,6 +995,7 @@ def get_extra(self, request, obj=None, **kwargs):
         return 1
 
 
+@admin.register(Workflow)
 class WorkflowAdmin(admin.ModelAdmin):
     inlines = [WorkflowStepInline]
     list_display = ["name", "is_default"]
@@ -1002,6 +1008,7 @@ class WorkflowAdmin(admin.ModelAdmin):
     ]
 
 
+@admin.register(ModerationCollection)
 class ModerationCollectionAdmin(admin.ModelAdmin):
     class Media:
         js = ("admin/js/jquery.init.js", "djangocms_moderation/js/actions.js",)
@@ -1136,6 +1143,7 @@ def has_delete_permission(self, request, obj=None):
         return False
 
 
+@admin.register(ConfirmationPage)
 class ConfirmationPageAdmin(PlaceholderAdminMixin, admin.ModelAdmin):
     view_on_site = True
 
@@ -1153,6 +1161,7 @@ def _url(regex, fn, name, **kwargs):
         return url_patterns + super().get_urls()
 
 
+@admin.register(ConfirmationFormSubmission)
 class ConfirmationFormSubmissionAdmin(admin.ModelAdmin):
     list_display = ["moderation_request", "for_step", "submitted_at"]
     fields = [
@@ -1202,12 +1211,3 @@ def form_data(self, obj):
     form_data.short_description = _("Form Data")
 
 
-admin.site.register(ModerationRequestTreeNode, ModerationRequestTreeAdmin)
-admin.site.register(ModerationRequest, ModerationRequestAdmin)
-admin.site.register(CollectionComment, CollectionCommentAdmin)
-admin.site.register(RequestComment, RequestCommentAdmin)
-admin.site.register(ModerationCollection, ModerationCollectionAdmin)
-admin.site.register(Role, RoleAdmin)
-admin.site.register(Workflow, WorkflowAdmin)
-admin.site.register(ConfirmationPage, ConfirmationPageAdmin)
-admin.site.register(ConfirmationFormSubmission, ConfirmationFormSubmissionAdmin)
diff --git a/djangocms_moderation/admin_actions.py b/djangocms_moderation/admin_actions.py
index 07fc3eea..926e1282 100644
--- a/djangocms_moderation/admin_actions.py
+++ b/djangocms_moderation/admin_actions.py
@@ -148,14 +148,14 @@ def add_items_to_collection(modeladmin, request, queryset):
                 args=(),
             ),
             version_ids=",".join(version_ids),
-            return_to_url=request.META.get("HTTP_REFERER", ""),
+            return_to_url=request.headers.get("referer", ""),
         )
         return HttpResponseRedirect(admin_url)
     else:
         modeladmin.message_user(
             request, _("No suitable items found to add to moderation collection")
         )
-        return HttpResponseRedirect(request.META.get("HTTP_REFERER", ""))
+        return HttpResponseRedirect(request.headers.get("referer", ""))
 
 
 add_items_to_collection.short_description = _("Add to moderation collection")
diff --git a/djangocms_moderation/apps.py b/djangocms_moderation/apps.py
index cbeed482..b2b7dbf1 100644
--- a/djangocms_moderation/apps.py
+++ b/djangocms_moderation/apps.py
@@ -7,6 +7,6 @@ class ModerationConfig(AppConfig):
     verbose_name = _("django CMS Moderation")
 
     def ready(self):
-        import djangocms_moderation.handlers  # noqa: F401
-        import djangocms_moderation.monkeypatch  # noqa: F401
+        import djangocms_moderation.handlers
+        import djangocms_moderation.monkeypatch
         import djangocms_moderation.signals  # noqa: F401
diff --git a/djangocms_moderation/backends.py b/djangocms_moderation/backends.py
index 416606c0..565e9390 100644
--- a/djangocms_moderation/backends.py
+++ b/djangocms_moderation/backends.py
@@ -20,4 +20,4 @@ def sequential_number_with_identifier_prefix_backend(**kwargs):
     semi-sequential numbers, prefixed with `workflow.identifier` field, if set
     """
     moderation_request = kwargs["moderation_request"]
-    return "{}{}".format(moderation_request.workflow.identifier, moderation_request.pk)
+    return f"{moderation_request.workflow.identifier}{moderation_request.pk}"
diff --git a/djangocms_moderation/cms_toolbars.py b/djangocms_moderation/cms_toolbars.py
index 6181cfb7..7679807a 100644
--- a/djangocms_moderation/cms_toolbars.py
+++ b/djangocms_moderation/cms_toolbars.py
@@ -68,7 +68,7 @@ def _add_moderation_buttons(self):
                 opts = ModerationRequest._meta
                 codename = get_permission_codename("add", opts)
                 if not self.request.user.has_perm(
-                    "{app_label}.{codename}".format(app_label=opts.app_label, codename=codename)
+                    f"{opts.app_label}.{codename}"
                 ):
                     return
                 version = Version.objects.get_for_content(self.toolbar.obj)
@@ -91,7 +91,7 @@ def _add_moderation_menu(self):
         opts = ModerationCollection._meta
         codename = get_permission_codename("change", opts)
         if not self.request.user.has_perm(
-            "{app_label}.{codename}".format(app_label=opts.app_label, codename=codename)
+            f"{opts.app_label}.{codename}"
         ):
             return
         admin_menu = self.toolbar.get_or_create_menu(ADMIN_MENU_IDENTIFIER)
diff --git a/djangocms_moderation/emails.py b/djangocms_moderation/emails.py
index 319a53e6..761c3b5b 100644
--- a/djangocms_moderation/emails.py
+++ b/djangocms_moderation/emails.py
@@ -35,7 +35,7 @@ def _send_email(
         "job_id": collection.job_id,
         "by_user": by_user,
     }
-    template = "djangocms_moderation/emails/moderation-request/{}".format(template)
+    template = f"djangocms_moderation/emails/moderation-request/{template}"
 
     # TODO What language should the email be sent in? e.g. `with force_language(lang):`
     subject = force_str(subject)
@@ -61,7 +61,7 @@ def notify_collection_author(collection, moderation_requests, action, by_user):
         moderation_requests=moderation_requests,
         recipients=[collection.author.email],
         subject=email_subjects[action],
-        template="{}.txt".format(action),
+        template=f"{action}.txt",
         by_user=by_user,
     )
     return status
diff --git a/djangocms_moderation/handlers.py b/djangocms_moderation/handlers.py
index 768ba335..50a9f9e4 100644
--- a/djangocms_moderation/handlers.py
+++ b/djangocms_moderation/handlers.py
@@ -11,7 +11,7 @@ def moderation_confirmation_form_submission(
     sender, page, language, user, form_data, **kwargs
 ):
     for field_data in form_data:
-        if not set(("label", "value")).issubset(field_data):
+        if not {"label", "value"}.issubset(field_data):
             raise ValueError("Each field dict should contain label and value keys.")
 
     # TODO Confirmation pages are not used/working in 1.0.x yet
diff --git a/djangocms_moderation/helpers.py b/djangocms_moderation/helpers.py
index 25249302..0e2eca0a 100644
--- a/djangocms_moderation/helpers.py
+++ b/djangocms_moderation/helpers.py
@@ -75,7 +75,7 @@ def get_active_moderation_request(content_object):
     If this returns None, it means there is no active_moderation request for this
     object, and it means it can be submitted for new moderation
     """
-    from djangocms_moderation.models import ModerationRequest  # noqa
+    from djangocms_moderation.models import ModerationRequest
 
     version = Version.objects.get_for_content(content_object)
 
diff --git a/djangocms_moderation/migrations/0001_initial.py b/djangocms_moderation/migrations/0001_initial.py
index b1464ba4..0efd9497 100644
--- a/djangocms_moderation/migrations/0001_initial.py
+++ b/djangocms_moderation/migrations/0001_initial.py
@@ -454,14 +454,14 @@ class Migration(migrations.Migration):
             ),
         ),
         migrations.AlterUniqueTogether(
-            name="workflowstep", unique_together=set([("role", "workflow")])
+            name="workflowstep", unique_together={("role", "workflow")}
         ),
         migrations.AlterUniqueTogether(
             name="moderationrequest",
-            unique_together=set([("collection", "object_id", "content_type")]),
+            unique_together={("collection", "object_id", "content_type")},
         ),
         migrations.AlterUniqueTogether(
             name="confirmationformsubmission",
-            unique_together=set([("request", "for_step")]),
+            unique_together={("request", "for_step")},
         ),
     ]
diff --git a/djangocms_moderation/migrations/0003_auto_20180903_1206.py b/djangocms_moderation/migrations/0003_auto_20180903_1206.py
index 8bbc691c..46e11fa2 100644
--- a/djangocms_moderation/migrations/0003_auto_20180903_1206.py
+++ b/djangocms_moderation/migrations/0003_auto_20180903_1206.py
@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
             preserve_default=False,
         ),
         migrations.AlterUniqueTogether(
-            name="moderationrequest", unique_together=set([("collection", "version")])
+            name="moderationrequest", unique_together={("collection", "version")}
         ),
         migrations.RemoveField(model_name="moderationrequest", name="content_type"),
         migrations.RemoveField(model_name="moderationrequest", name="object_id"),
diff --git a/djangocms_moderation/migrations/0011_auto_20181008_1328.py b/djangocms_moderation/migrations/0011_auto_20181008_1328.py
index 23829d74..db52ec3a 100644
--- a/djangocms_moderation/migrations/0011_auto_20181008_1328.py
+++ b/djangocms_moderation/migrations/0011_auto_20181008_1328.py
@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
         # AlterUniqueTogether needs to happen before removing field
         migrations.AlterUniqueTogether(
             name="confirmationformsubmission",
-            unique_together=set([("moderation_request", "for_step")]),
+            unique_together={("moderation_request", "for_step")},
         ),
         migrations.RemoveField(model_name="confirmationformsubmission", name="request"),
         migrations.RemoveField(model_name="moderationrequestaction", name="request"),
diff --git a/djangocms_moderation/models.py b/djangocms_moderation/models.py
index 1e92dccc..272a0f3f 100644
--- a/djangocms_moderation/models.py
+++ b/djangocms_moderation/models.py
@@ -240,7 +240,7 @@ def __str__(self):
 
     @property
     def job_id(self):
-        return "{}".format(self.pk)
+        return f"{self.pk}"
 
     @property
     def author_name(self):
@@ -444,7 +444,7 @@ class Meta:
         ordering = ["id"]
 
     def __str__(self):
-        return "{} {}".format(self.pk, self.version_id)
+        return f"{self.pk} {self.version_id}"
 
     @cached_property
     def workflow(self):
@@ -651,7 +651,7 @@ class Meta:
         verbose_name_plural = _("Actions")
 
     def __str__(self):
-        return "{} - {}".format(self.moderation_request_id, self.get_action_display())
+        return f"{self.moderation_request_id} - {self.get_action_display()}"
 
     def get_by_user_name(self):
         if not self.to_user:
@@ -686,7 +686,7 @@ def save(self, **kwargs):
 
         if next_step:
             self.to_role_id = next_step.role_id
-        super(ModerationRequestAction, self).save(**kwargs)
+        super().save(**kwargs)
 
 
 class AbstractComment(models.Model):
@@ -743,7 +743,7 @@ class ConfirmationFormSubmission(models.Model):
     )
 
     def __str__(self):
-        return "{} - {}".format(self.request_id, self.for_step)
+        return f"{self.request_id} - {self.for_step}"
 
     class Meta:
         verbose_name = _("Confirmation Form Submission")
diff --git a/djangocms_moderation/static/djangocms_moderation/css/actions.css b/djangocms_moderation/static/djangocms_moderation/css/actions.css
index e86c02d9..d1c2c989 100644
--- a/djangocms_moderation/static/djangocms_moderation/css/actions.css
+++ b/djangocms_moderation/static/djangocms_moderation/css/actions.css
@@ -33,9 +33,9 @@ a.btn.cms-moderation-action-btn span {
     display: inline-block;
 }
 span.svg-juxtaposed-font {
-    text-rendering: auto; 
-    display: inline-block; 
-    line-height: 1rem; 
-    vertical-align: 20%; 
-    margin-top: -2px !important; 
+    text-rendering: auto;
+    display: inline-block;
+    line-height: 1rem;
+    vertical-align: 20%;
+    margin-top: -2px !important;
 }
\ No newline at end of file
diff --git a/djangocms_moderation/templates/djangocms_moderation/base_confirmation_build.html b/djangocms_moderation/templates/djangocms_moderation/base_confirmation_build.html
index 89b3eab2..cc55a8dd 100644
--- a/djangocms_moderation/templates/djangocms_moderation/base_confirmation_build.html
+++ b/djangocms_moderation/templates/djangocms_moderation/base_confirmation_build.html
@@ -16,7 +16,7 @@
 
             {% block post_content %}{% endblock %}
         </div>
-        
+
         {% render_block "js" %}
         {% block extrajs %}{% endblock %}
     </body>
diff --git a/djangocms_moderation/utils.py b/djangocms_moderation/utils.py
index 1f29c242..cc19722b 100644
--- a/djangocms_moderation/utils.py
+++ b/djangocms_moderation/utils.py
@@ -17,7 +17,7 @@ def get_absolute_url(location, site=None):
         scheme = "https"
     else:
         scheme = "http"
-    domain = "{}://{}".format(scheme, site.domain)
+    domain = f"{scheme}://{site.domain}"
     return urljoin(domain, location)
 
 
diff --git a/docs/comment.rst b/docs/comment.rst
index 8bdc8c25..d9959034 100644
--- a/docs/comment.rst
+++ b/docs/comment.rst
@@ -2,7 +2,7 @@
 
 Comment
 ================================================
-Comments may be added to various moderation entities: 
+Comments may be added to various moderation entities:
  * :ref:`moderation_collection`
  * :ref:`moderation_request`
  * :ref:`moderation_request_action`
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index 1273cc40..6e6aa86e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Configuration file for the Sphinx documentation builder.
 #
diff --git a/docs/lock.rst b/docs/lock.rst
index 06e7a0b9..05553d0f 100644
--- a/docs/lock.rst
+++ b/docs/lock.rst
@@ -2,8 +2,8 @@
 
 Moderation Review Lock
 ================================================
-As soon as a :ref:`moderation_collection` status becomes in review then its drafts are automatically locked, in the sense that their content can no longer be edited (not at all, not by anyone, not even the collection author). Also once a collection is in Review then content versions cannot be added to the collection. This means that once you’ve clicked “Submit for review”: 
+As soon as a :ref:`moderation_collection` status becomes in review then its drafts are automatically locked, in the sense that their content can no longer be edited (not at all, not by anyone, not even the collection author). Also once a collection is in Review then content versions cannot be added to the collection. This means that once you’ve clicked “Submit for review”:
  * Collection Lock: New drafts cannot be added to the :ref:`moderation_collection`
  * Version Lock: Drafts in the :ref:`moderation_collection` cannot be edited unless rejected
-   
-Once a version is published the Moderation Version Lock is removed automatically. 
\ No newline at end of file
+
+Once a version is published the Moderation Version Lock is removed automatically.
\ No newline at end of file
diff --git a/docs/moderation_collection.rst b/docs/moderation_collection.rst
index cdddf4fc..4a3cc12a 100644
--- a/docs/moderation_collection.rst
+++ b/docs/moderation_collection.rst
@@ -3,10 +3,10 @@
 Moderation Collection
 ================================================
 
-A Moderation Collection is primarily intended as a way of being able to group draft content versions together for: 
-a) review and 
+A Moderation Collection is primarily intended as a way of being able to group draft content versions together for:
+a) review and
 b) publishing
-   
+
 The rules for adding items to a Collection, removing items from a Collection and the actions that can be taken on items the Collection may vary by :ref:`workflow`.
 
 Publishing is a `djangocms-versioning` feature, thus `djangocms-moderation` depends on and extends the functionality made available by the Versioning addon.
@@ -16,7 +16,7 @@ Collections are stateful. The available states are:
  * In review
  * Archived
  * Cancelled
-  
+
 Drafts can only be added to a Collection during the `Collecting` phase (see :ref:`lock`)
 
 Buttons
@@ -76,7 +76,7 @@ A collection can also be flagged as cancelled. This is similar to Archived excep
 
 Bulk Actions
 -------------------------------------------------
-These will appear in the Collection’s action drop-down for each content-type registered with Moderation. 
+These will appear in the Collection’s action drop-down for each content-type registered with Moderation.
 
 Remove from collection
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -92,4 +92,4 @@ Flags a draft as being in need of further editing
 
 Submit for review
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Useful for items that have been flagged for rework - resubmits them for review, sending out notifications again. 
+Useful for items that have been flagged for rework - resubmits them for review, sending out notifications again.
diff --git a/docs/overview.rst b/docs/overview.rst
index 57207d65..806bfec9 100644
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -5,7 +5,7 @@ Overview
 
 Moderation provides an approval workflow mechanism for organisations who need to ensure that content is approved before it is published. It is designed to extend and compliment the Versioning addon and has that as a dependency.
 
-The general idea is that a draft version can be submitted for moderation. This involves adding that draft to a :ref:`moderation_collection`, which can be thought of as a chapter, edition or batch of content that aims to all be published simultaneously. Various drafts can be added to the same :ref:`moderation_collection`. 
+The general idea is that a draft version can be submitted for moderation. This involves adding that draft to a :ref:`moderation_collection`, which can be thought of as a chapter, edition or batch of content that aims to all be published simultaneously. Various drafts can be added to the same :ref:`moderation_collection`.
 
 Drafts within the :ref:`moderation_collection` can then be approved rejected by various parties according to :ref:`role`s defined within the :ref:`workflow` assigned to the :ref:`moderation_collection`.
 
diff --git a/tests/test_admin_actions.py b/tests/test_admin_actions.py
index b0c3fbd8..c026b84d 100644
--- a/tests/test_admin_actions.py
+++ b/tests/test_admin_actions.py
@@ -1,5 +1,5 @@
-import mock
 import unittest
+from unittest import mock
 
 from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
 from django.contrib.auth.models import Group
@@ -66,7 +66,7 @@ def setUp(self):
 
         # Set up the url data
         self.url = reverse("admin:djangocms_moderation_moderationrequesttreenode_changelist")
-        self.url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        self.url += f"?moderation_request__collection__id={self.collection.pk}"
 
         # Asserts to check data set up is ok. Ideally wouldn't need them, but
         # the set up is so complex that it's safer to have them.
@@ -409,7 +409,7 @@ def setUp(self):
 
         # Set up the url data
         self.url = reverse("admin:djangocms_moderation_moderationrequesttreenode_changelist")
-        self.url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        self.url += f"?moderation_request__collection__id={self.collection.pk}"
 
         # Asserts to check data set up is ok. Ideally wouldn't need them, but
         # the set up is so complex that it's safer to have them.
@@ -586,7 +586,7 @@ def setUp(self):
 
         # Set up the url data
         self.url = reverse("admin:djangocms_moderation_moderationrequesttreenode_changelist")
-        self.url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        self.url += f"?moderation_request__collection__id={self.collection.pk}"
 
         # Asserts to check data set up is ok. Ideally wouldn't need them, but
         # the set up is so complex that it's safer to have them.
@@ -813,7 +813,7 @@ def setUp(self):
         self.client.force_login(self.user)
 
         self.url = reverse("admin:djangocms_moderation_moderationrequesttreenode_changelist")
-        self.url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        self.url += f"?moderation_request__collection__id={self.collection.pk}"
 
         # Asserts to check data set up is ok. Ideally wouldn't need them, but
         # the set up is so complex that it's safer to have them.
@@ -963,7 +963,7 @@ def setUp(self):
             id=6, moderation_request=self.moderation_request2)
 
         self.url = reverse("admin:djangocms_moderation_moderationrequesttreenode_changelist")
-        self.url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        self.url += f"?moderation_request__collection__id={self.collection.pk}"
 
     @mock.patch.object(ModerationRequestTreeAdmin, "has_delete_permission", mock.Mock(return_value=True))
     def test_delete_selected_action_cannot_be_accessed_if_not_collection_author(self):
@@ -1112,7 +1112,7 @@ def setUp(self):
 
         # Generate url and POST data
         self.url = reverse("admin:djangocms_moderation_moderationrequesttreenode_changelist")
-        self.url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        self.url += f"?moderation_request__collection__id={self.collection.pk}"
         self.data = get_url_data(self, "delete_selected")
 
     def tearDown(self):
diff --git a/tests/test_app_registration.py b/tests/test_app_registration.py
index 1b2423dc..eb28f94a 100644
--- a/tests/test_app_registration.py
+++ b/tests/test_app_registration.py
@@ -1,7 +1,7 @@
 try:
     from unittest.mock import Mock
 except ImportError:
-    from mock import Mock
+    from unittest.mock import Mock
 
 from unittest import TestCase, skip
 from unittest.mock import patch
diff --git a/tests/test_cms_toolbars.py b/tests/test_cms_toolbars.py
index 62727ebe..f1dccae3 100644
--- a/tests/test_cms_toolbars.py
+++ b/tests/test_cms_toolbars.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 from django.contrib.auth.models import Permission, User
 from django.test.client import RequestFactory
@@ -139,7 +139,7 @@ def test_page_in_collection_collection(self):
 
         self.assertTrue(
             self._button_exists(
-                'In collection "{} ({})"'.format(collection.name, collection.id),
+                f'In collection "{collection.name} ({collection.id})"',
                 toolbar.toolbar,
             )
         )
@@ -157,7 +157,7 @@ def test_page_in_collection_moderating(self):
 
         self.assertTrue(
             self._button_exists(
-                'In moderation "{} ({})"'.format(collection.name, collection.id),
+                f'In moderation "{collection.name} ({collection.id})"',
                 toolbar.toolbar,
             )
         )
diff --git a/tests/test_forms.py b/tests/test_forms.py
index 571e591f..4439508a 100644
--- a/tests/test_forms.py
+++ b/tests/test_forms.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 from django.contrib.auth.models import User
 from django.forms import HiddenInput
@@ -248,7 +248,7 @@ def test_collection_choice_should_be_limited_to_current_user_and_collecting_stat
             form = CollectionItemsForm(data=data, user=user)
 
             self.assertEqual(
-                form.is_valid(), fixture[1], "{} failed".format(fixture[0])
+                form.is_valid(), fixture[1], f"{fixture[0]} failed"
             )
             if not form.is_valid():
                 self.assertIn("collection", form.errors)
diff --git a/tests/test_helpers.py b/tests/test_helpers.py
index ebdacf10..40cc4777 100644
--- a/tests/test_helpers.py
+++ b/tests/test_helpers.py
@@ -1,6 +1,5 @@
 import json
-import mock
-from unittest import skip
+from unittest import mock, skip
 
 from django.template.defaultfilters import truncatechars
 from django.urls import reverse
@@ -115,7 +114,7 @@ def setUp(self):
 
     def test_get_moderation_button_title_and_url_when_collection(self):
         title, url = get_moderation_button_title_and_url(self.mr)
-        self.assertEqual(title, 'In collection "C1 ({})"'.format(self.collection.id))
+        self.assertEqual(title, f'In collection "C1 ({self.collection.id})"')
         self.assertEqual(url, self.expected_url)
 
     def test_get_moderation_button_title_and_url_when_in_review(self):
@@ -123,7 +122,7 @@ def test_get_moderation_button_title_and_url_when_in_review(self):
         self.collection.save()
 
         title, url = get_moderation_button_title_and_url(self.mr)
-        self.assertEqual(title, 'In moderation "C1 ({})"'.format(self.collection.id))
+        self.assertEqual(title, f'In moderation "C1 ({self.collection.id})"')
         self.assertEqual(url, self.expected_url)
 
     def test_get_moderation_button_truncated_title_and_url(self):
@@ -135,7 +134,7 @@ def test_get_moderation_button_truncated_title_and_url(self):
         self.assertEqual(
             title,
             # By default, truncate will shorten the name
-            'In collection "{} ({})"'.format(expected_title, self.collection.id),
+            f'In collection "{expected_title} ({self.collection.id})"',
         )
         with mock.patch("djangocms_moderation.helpers.COLLECTION_NAME_LENGTH_LIMIT", 3):
             title, url = get_moderation_button_title_and_url(self.mr)
@@ -143,7 +142,7 @@ def test_get_moderation_button_truncated_title_and_url(self):
             self.assertEqual(
                 title,
                 # As the limit is only 3, the truncate will produce `...`
-                'In collection "{} ({})"'.format(expected_title, self.collection.id),
+                f'In collection "{expected_title} ({self.collection.id})"',
             )
 
         with mock.patch(
diff --git a/tests/test_integration.py b/tests/test_integration.py
index c0d1b01f..9110714e 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 from djangocms_versioning.test_utils.factories import PageVersionFactory
 
diff --git a/tests/test_models.py b/tests/test_models.py
index b00b6bfa..53d48d5d 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -1,5 +1,5 @@
 import json
-from mock import patch
+from unittest.mock import patch
 
 from django.contrib.auth.models import Permission, User
 from django.core.exceptions import ValidationError
@@ -390,7 +390,7 @@ def test_compliance_number_sequential_number_with_identifier_prefix_backend(self
         request.refresh_from_db()
         self.assertIsNone(request.compliance_number)
 
-        expected = "SSO{}".format(request.pk)
+        expected = f"SSO{request.pk}"
         request.set_compliance_number()
         request.refresh_from_db()
         self.assertEqual(request.compliance_number, expected)
diff --git a/tests/test_moderation_flows.py b/tests/test_moderation_flows.py
index 0531e02e..41fe54d1 100644
--- a/tests/test_moderation_flows.py
+++ b/tests/test_moderation_flows.py
@@ -53,7 +53,7 @@ def _process_moderation_request(self, user, action, message="Test message"):
         self.client.force_login(user)
         response = self.client.post(
             get_admin_url(
-                name="cms_moderation_{}_request".format(action),
+                name=f"cms_moderation_{action}_request",
                 language="en",
                 args=(self.page.pk, "en"),
             ),
diff --git a/tests/test_monkeypatch.py b/tests/test_monkeypatch.py
index 6f5dad2f..9e682d55 100644
--- a/tests/test_monkeypatch.py
+++ b/tests/test_monkeypatch.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 from django.contrib import admin
 from django.urls import reverse
diff --git a/tests/test_views.py b/tests/test_views.py
index b7ecee19..bfbd24f5 100644
--- a/tests/test_views.py
+++ b/tests/test_views.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
 from django.contrib.messages import get_messages
@@ -629,7 +629,7 @@ def test_initial_form_values_when_collection_id_passed(self):
         pg_version = PageVersionFactory()
         poll_version = PollVersionFactory()
         self.url += "?collection_id=" + str(collection.pk)
-        self.url += "&version_ids={},{}".format(pg_version.pk, poll_version.pk)
+        self.url += f"&version_ids={pg_version.pk},{poll_version.pk}"
 
         response = self.client.get(self.url)
 
@@ -648,7 +648,7 @@ def test_initial_form_values_when_collection_id_passed(self):
     def test_initial_form_values_when_collection_id_not_passed(self):
         pg_version = PageVersionFactory()
         poll_version = PollVersionFactory()
-        self.url += "?version_ids={},{}".format(pg_version.pk, poll_version.pk)
+        self.url += f"?version_ids={pg_version.pk},{poll_version.pk}"
 
         response = self.client.get(self.url)
 
@@ -774,7 +774,7 @@ def test_tree_nodes_are_created(self):
 
 class SubmitCollectionForModerationViewTest(BaseViewTestCase):
     def setUp(self):
-        super(SubmitCollectionForModerationViewTest, self).setUp()
+        super().setUp()
         self.url = reverse(
             "admin:cms_moderation_submit_collection_for_moderation",
             args=(self.collection2.pk,),
@@ -820,7 +820,7 @@ def test_submit_collection_for_moderation(self, cancel_mock):
 
 class ModerationRequestChangeListView(BaseViewTestCase):
     def setUp(self):
-        super(ModerationRequestChangeListView, self).setUp()
+        super().setUp()
         self.collection_submit_url = reverse(
             "admin:cms_moderation_submit_collection_for_moderation",
             args=(self.collection2.pk,),
@@ -1038,7 +1038,7 @@ def test_moderation_workflow_node_deletion_1(self):
 
         # Load the changelist and check that the page loads without an error
         changelist_url = reverse('admin:djangocms_moderation_moderationrequesttreenode_changelist')
-        changelist_url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        changelist_url += f"?moderation_request__collection__id={self.collection.pk}"
         response = self.client.get(changelist_url)
         self.assertEqual(response.status_code, 200)
 
@@ -1093,7 +1093,7 @@ def test_moderation_workflow_node_deletion_2(self):
 
         # Load the changelist and check that the page loads without an error
         changelist_url = reverse('admin:djangocms_moderation_moderationrequesttreenode_changelist')
-        changelist_url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        changelist_url += f"?moderation_request__collection__id={self.collection.pk}"
         response = self.client.get(changelist_url)
         self.assertEqual(response.status_code, 200)
 
@@ -1149,7 +1149,7 @@ def test_moderation_workflow_node_deletion_3(self):
 
         # Load the changelist and check that the page loads without an error
         changelist_url = reverse('admin:djangocms_moderation_moderationrequesttreenode_changelist')
-        changelist_url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        changelist_url += f"?moderation_request__collection__id={self.collection.pk}"
         response = self.client.get(changelist_url)
         self.assertEqual(response.status_code, 200)
 
@@ -1209,7 +1209,7 @@ def test_moderation_workflow_node_deletion_4(self):
 
         # Load the changelist and check that the page loads without an error
         changelist_url = reverse('admin:djangocms_moderation_moderationrequesttreenode_changelist')
-        changelist_url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        changelist_url += f"?moderation_request__collection__id={self.collection.pk}"
         response = self.client.get(changelist_url)
         self.assertEqual(response.status_code, 200)
 
@@ -1268,7 +1268,7 @@ def test_moderation_workflow_node_deletion_5(self):
 
         # Load the changelist and check that the page loads without an error
         changelist_url = reverse('admin:djangocms_moderation_moderationrequesttreenode_changelist')
-        changelist_url += "?moderation_request__collection__id={}".format(self.collection.pk)
+        changelist_url += f"?moderation_request__collection__id={self.collection.pk}"
         response = self.client.get(changelist_url)
         self.assertEqual(response.status_code, 200)
 
diff --git a/tests/utils/factories.py b/tests/utils/factories.py
index 811f0955..a8618c71 100644
--- a/tests/utils/factories.py
+++ b/tests/utils/factories.py
@@ -134,7 +134,7 @@ class UserFactory(DjangoModelFactory):
     first_name = factory.Faker("first_name")
     last_name = factory.Faker("last_name")
     email = factory.LazyAttribute(
-        lambda u: "%s.%s@example.com" % (u.first_name.lower(), u.last_name.lower())
+        lambda u: "{}.{}@example.com".format(u.first_name.lower(), u.last_name.lower())
     )
 
     class Meta:
diff --git a/tests/utils/moderated_polls/models.py b/tests/utils/moderated_polls/models.py
index 81147b54..eb0785ba 100644
--- a/tests/utils/moderated_polls/models.py
+++ b/tests/utils/moderated_polls/models.py
@@ -10,7 +10,7 @@ class Poll(models.Model):
     name = models.TextField()
 
     def __str__(self):
-        return "{} ({})".format(self.name, self.pk)
+        return f"{self.name} ({self.pk})"
 
 
 class PollContent(models.Model):
diff --git a/tests/utils/versioned_none_moderated_app/models.py b/tests/utils/versioned_none_moderated_app/models.py
index 674ff192..dafffb62 100644
--- a/tests/utils/versioned_none_moderated_app/models.py
+++ b/tests/utils/versioned_none_moderated_app/models.py
@@ -9,7 +9,7 @@ class NoneModeratedPoll(models.Model):
     name = models.TextField()
 
     def __str__(self):
-        return "{} ({})".format(self.name, self.pk)
+        return f"{self.name} ({self.pk})"
 
 
 class NoneModeratedPollContent(models.Model):