diff --git a/component/tests/common.py b/component/tests/common.py
index 49133c4ee..ae2f5e498 100644
--- a/component/tests/common.py
+++ b/component/tests/common.py
@@ -46,10 +46,6 @@ def setUpComponent(cls):
                     )
                 )
 
-    # pylint: disable=W8106
-    def setUp(self):
-        self.setUpComponentRegistryReady()
-
     def setUpComponentRegistryReady(self):
         # should be ready only during tests, never during installation
         # of addons
@@ -74,19 +70,9 @@ def setUpClass(cls):
         super().setUpClass()
         cls.setUpComponent()
 
-    # pylint: disable=W8106
     def setUp(self):
-        # resolve an inheritance issue (common.TransactionCase does not call
-        # super)
-        common.TransactionCase.setUp(self)
-        ComponentMixin.setUp(self)
-        # There's no env on setUpClass of TransactionCase, must do it here.
-        self.env = self.env(
-            context=dict(
-                self.env.context,
-                components_registry=self._components_registry,
-            )
-        )
+        super().setUp()
+        self.setUpComponentRegistryReady()
 
 
 class ComponentRegistryCase: