diff --git a/component_event/__manifest__.py b/component_event/__manifest__.py
index b30f70053..f520dd457 100644
--- a/component_event/__manifest__.py
+++ b/component_event/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Components Events",
-    "version": "16.0.1.0.1",
+    "version": "17.0.1.0.0",
     "author": "Camptocamp," "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/connector",
     "license": "LGPL-3",
diff --git a/component_event/components/event.py b/component_event/components/event.py
index 364087122..67bfd17fc 100644
--- a/component_event/components/event.py
+++ b/component_event/components/event.py
@@ -220,7 +220,7 @@ class EventCollecter(Component):
     @classmethod
     def _complete_component_build(cls):
         """Create a cache on the class when the component is built"""
-        super(EventCollecter, cls)._complete_component_build()
+        super()._complete_component_build()
         # the _cache being on the component class, which is
         # dynamically rebuild when odoo registry is rebuild, we
         # are sure that the result is always the same for a lookup
@@ -293,6 +293,6 @@ def _build_event_listener_component(cls):
 
     @classmethod
     def _complete_component_build(cls):
-        super(EventListener, cls)._complete_component_build()
+        super()._complete_component_build()
         cls._build_event_listener_component()
         return
diff --git a/component_event/core.py b/component_event/core.py
index d9b228966..63e937f05 100644
--- a/component_event/core.py
+++ b/component_event/core.py
@@ -52,7 +52,7 @@ def __init__(
             raise ValueError("collection and env cannot both be provided")
 
         self.env = env
-        super(EventWorkContext, self).__init__(
+        super().__init__(
             model_name=model_name,
             collection=collection,
             components_registry=components_registry,
@@ -67,7 +67,7 @@ def env(self):
         """Return the current Odoo env"""
         if self._env:
             return self._env
-        return super(EventWorkContext, self).env
+        return super().env
 
     @env.setter
     def env(self, value):
diff --git a/component_event/models/base.py b/component_event/models/base.py
index fd180c24c..97f3b8c12 100644
--- a/component_event/models/base.py
+++ b/component_event/models/base.py
@@ -99,14 +99,14 @@ def button_do_something(self):
 
     @api.model_create_multi
     def create(self, vals_list):
-        records = super(Base, self).create(vals_list)
+        records = super().create(vals_list)
         for idx, vals in enumerate(vals_list):
             fields = list(vals.keys())
             self._event("on_record_create").notify(records[idx], fields=fields)
         return records
 
     def write(self, vals):
-        result = super(Base, self).write(vals)
+        result = super().write(vals)
         fields = list(vals.keys())
         for record in self:
             self._event("on_record_write").notify(record, fields=fields)
@@ -115,5 +115,5 @@ def write(self, vals):
     def unlink(self):
         for record in self:
             self._event("on_record_unlink").notify(record)
-        result = super(Base, self).unlink()
+        result = super().unlink()
         return result
diff --git a/component_event/tests/test_event.py b/component_event/tests/test_event.py
index f9b6fe686..770764fd2 100644
--- a/component_event/tests/test_event.py
+++ b/component_event/tests/test_event.py
@@ -1,9 +1,9 @@
 # Copyright 2017 Camptocamp SA
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
 
-import unittest
 from unittest import mock
 
+from odoo.tests.case import TestCase
 from odoo.tests.common import MetaCase, tagged
 
 from odoo.addons.component.core import Component
@@ -16,7 +16,7 @@
 
 
 @tagged("standard", "at_install")
-class TestEventWorkContext(unittest.TestCase, MetaCase("DummyCase", (), {})):
+class TestEventWorkContext(TestCase, MetaCase("DummyCase", (), {})):
     """Test Events Components"""
 
     def __init__(self, *args, **kwargs):
@@ -137,7 +137,7 @@ class TestEvent(ComponentRegistryCase):
     """Test Events Components"""
 
     def setUp(self):
-        super(TestEvent, self).setUp()
+        super().setUp()
         self._setup_registry(self)
         self._load_module_components("component_event")
 
@@ -367,7 +367,7 @@ class TestEventFromModel(TransactionComponentRegistryCase):
     """Test Events Components from Models"""
 
     def setUp(self):
-        super(TestEventFromModel, self).setUp()
+        super().setUp()
         self._setup_registry(self)
         self._load_module_components("component_event")