diff --git a/partner_company_default/models/res_company.py b/partner_company_default/models/res_company.py
index 7697ec784a56..0a9c1ee816cc 100644
--- a/partner_company_default/models/res_company.py
+++ b/partner_company_default/models/res_company.py
@@ -10,5 +10,4 @@ class ResCompany(models.Model):
     @api.model
     def create(self, vals):
         self = self.with_context(creating_from_company=True)
-        company = super(ResCompany, self).create(vals)
-        return company
+        return super().create(vals)
diff --git a/partner_company_default/tests/test_partner_company_default.py b/partner_company_default/tests/test_partner_company_default.py
index 84d6ba8a32fd..7703de4e66c8 100644
--- a/partner_company_default/tests/test_partner_company_default.py
+++ b/partner_company_default/tests/test_partner_company_default.py
@@ -5,40 +5,24 @@
 
 
 class TestPartnerCompanyDefault(common.TransactionCase):
-    def setUp(self):
-        super(TestPartnerCompanyDefault, self).setUp()
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.user = cls.env.ref("base.user_admin")
 
     def test_partner_company_default(self):
-        user = self.env["res.users"].create(
-            {
-                "name": "Test User",
-                "login": "Test User",
-                "email": "test@yourcompany.com",
-                "groups_id": [
-                    (
-                        6,
-                        0,
-                        [
-                            self.env.ref("base.group_system").id,
-                            self.env.ref("base.group_partner_manager").id,
-                        ],
-                    )
-                ],
-            }
-        )
-
-        # Test created partner company
+        # Check company of newly created partner
         partner = (
             self.env["res.partner"]
-            .with_user(user.id)
+            .with_user(self.user.id)
             .create({"name": "Test Partner 1"})
         )
-        self.assertEqual(partner.company_id, user.company_id)
+        self.assertEqual(partner.company_id, self.user.company_id)
 
-        # Test partners of multi company
+        # Check company of the partner of newly created company
         company_fr = (
             self.env["res.company"]
-            .with_user(user.id)
+            .with_user(self.user.id)
             .create(
                 {
                     "name": "French company",
@@ -49,12 +33,12 @@ def test_partner_company_default(self):
         )
         self.assertFalse(company_fr.partner_id.company_id)
 
-        user.company_ids = [(4, company_fr.id)]
-        user.company_id = company_fr.id
+        # Switch user's company and create a partner
+        self.user.company_ids = [(4, company_fr.id)]
+        self.user.company_id = company_fr.id
         partner = (
             self.env["res.partner"]
-            .with_user(user.id)
+            .with_user(self.user.id)
             .create({"name": "Test Partner 2"})
         )
-
         self.assertEqual(partner.company_id, company_fr)