diff --git a/addons/hr/tests/common.py b/addons/hr/tests/common.py
index d03507597e8..f84b7d85fc3 100644
--- a/addons/hr/tests/common.py
+++ b/addons/hr/tests/common.py
@@ -9,44 +9,17 @@ class TestHrCommon(common.TransactionCase):
     def setUp(self):
         super(TestHrCommon, self).setUp()
 
-        self.Users = self.env['res.users']
+        self._quick_create_ctx = {
+            'mail_create_nolog': True,
+            'mail_create_nosubscribe': True,
+            'mail_notrack': True,
+        }
+        self._quick_create_user_ctx = dict(self._quick_create_ctx, no_reset_password=True)
 
-        self.group_hr_manager_id = self.ref('hr.group_hr_manager')
-        self.group_hr_user_id = self.ref('hr.group_hr_user')
-        self.group_user_id = self.ref('base.group_user')
-
-        # Will be used in various test cases of test_hr_flow
-        self.demo_user_id = self.ref('base.user_demo')
-        self.main_company_id = self.ref('base.main_company')
-        self.main_partner_id = self.ref('base.main_partner')
-        self.rd_department_id = self.ref('hr.dep_rd')
-
-        # Creating three users and assigning each a group related to Human Resource Management
-        self.res_users_hr_manager = self.Users.create({
-            'company_id': self.main_company_id,
-            'name': 'HR manager',
-            'login': 'hrm',
-            'email': 'hrm@example.com',
-            'groups_id': [(6, 0, [self.group_hr_manager_id])]
-        })
-
-        self.res_users_hr_officer = self.Users.create({
-            'company_id': self.main_company_id,
+        self.res_users_hr_officer = self.env['res.users'].with_context(self._quick_create_user_ctx).create({
             'name': 'HR Officer',
             'login': 'hro',
             'email': 'hro@example.com',
-            'groups_id': [(6, 0, [self.group_hr_user_id])]
+            'company_id': self.ref('base.main_company'),
+            'groups_id': [(6, 0, [self.ref('base.group_user'), self.ref('hr.group_hr_user')])]
         })
-
-        self.res_users_employee = self.Users.create({
-            'company_id': self.main_company_id,
-            'name': 'Employee',
-            'login': 'emp',
-            'email': 'emp@example.com',
-            'groups_id': [(6, 0, [self.group_user_id])]
-        })
-
-        # Will be used to test the flow of jobs(i.e. opening the job position for "Developer" for
-        # recruitment and closing it after recruitment done)
-        self.job_developer = self.env(user=self.res_users_hr_officer.id).ref('hr.job_developer')
-        self.employee_niv = self.env(user=self.res_users_hr_officer.id).ref('hr.employee_niv')
diff --git a/addons/hr/tests/test_hr_flow.py b/addons/hr/tests/test_hr_flow.py
index 4986bda8115..da124d2bb1b 100644
--- a/addons/hr/tests/test_hr_flow.py
+++ b/addons/hr/tests/test_hr_flow.py
@@ -6,6 +6,12 @@ from odoo.addons.hr.tests.common import TestHrCommon
 
 class TestHrFlow(TestHrCommon):
 
+    def setUp(self):
+        super(TestHrFlow, self).setUp()
+
+        self.job_developer = self.env(user=self.res_users_hr_officer.id).ref('hr.job_developer')
+        self.employee_niv = self.env(user=self.res_users_hr_officer.id).ref('hr.employee_niv')
+
     def test_open2recruit2close_job(self):
 
         """ Opening the job position for "Developer" and checking the job status and recruitment count. """