diff --git a/addons/account/tests/common.py b/addons/account/tests/common.py
index 293320b6ba4..69b7124bd69 100644
--- a/addons/account/tests/common.py
+++ b/addons/account/tests/common.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from odoo import fields
-from odoo.tests.common import SavepointCase, HttpSavepointCase, tagged, Form
+from odoo.tests.common import TransactionCase, HttpCase, tagged, Form
 
 import time
 import base64
 from lxml import etree
 
 @tagged('post_install', '-at_install')
-class AccountTestInvoicingCommon(SavepointCase):
+class AccountTestInvoicingCommon(TransactionCase):
 
     @classmethod
     def copy_account(cls, account):
@@ -487,7 +487,7 @@ class AccountTestInvoicingCommon(SavepointCase):
 
 
 @tagged('post_install', '-at_install')
-class AccountTestInvoicingHttpCommon(AccountTestInvoicingCommon, HttpSavepointCase):
+class AccountTestInvoicingHttpCommon(AccountTestInvoicingCommon, HttpCase):
     pass
 
 
diff --git a/addons/account/tests/test_fiscal_position.py b/addons/account/tests/test_fiscal_position.py
index 0607d99b1b0..5bcb87d1aba 100644
--- a/addons/account/tests/test_fiscal_position.py
+++ b/addons/account/tests/test_fiscal_position.py
@@ -4,7 +4,7 @@
 from odoo.tests import common
 
 
-class TestFiscalPosition(common.SavepointCase):
+class TestFiscalPosition(common.TransactionCase):
     """Tests for fiscal positions in auto apply (account.fiscal.position).
     If a partner has a vat number, the fiscal positions with "vat_required=True"
     are preferred.
diff --git a/addons/base_address_extended/tests/test_street_fields.py b/addons/base_address_extended/tests/test_street_fields.py
index 4f8a2a30be0..6133e56663e 100644
--- a/addons/base_address_extended/tests/test_street_fields.py
+++ b/addons/base_address_extended/tests/test_street_fields.py
@@ -2,10 +2,10 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import models
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class TestStreetFields(SavepointCase):
+class TestStreetFields(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/calendar/tests/test_access_rights.py b/addons/calendar/tests/test_access_rights.py
index 2aaff1ea14c..a6f6519adec 100644
--- a/addons/calendar/tests/test_access_rights.py
+++ b/addons/calendar/tests/test_access_rights.py
@@ -3,11 +3,11 @@
 
 from datetime import datetime
 
-from odoo.tests.common import SavepointCase, new_test_user
+from odoo.tests.common import TransactionCase, new_test_user
 from odoo.exceptions import AccessError
 
 
-class TestAccessRights(SavepointCase):
+class TestAccessRights(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/calendar/tests/test_attendees.py b/addons/calendar/tests/test_attendees.py
index 74c3f843ced..d9e1c1db4fc 100644
--- a/addons/calendar/tests/test_attendees.py
+++ b/addons/calendar/tests/test_attendees.py
@@ -3,10 +3,10 @@
 
 from datetime import datetime
 
-from odoo.tests.common import SavepointCase, new_test_user
+from odoo.tests.common import TransactionCase, new_test_user
 
 
-class TestEventNotifications(SavepointCase):
+class TestEventNotifications(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/calendar/tests/test_event_notifications.py b/addons/calendar/tests/test_event_notifications.py
index 798ee73da3d..a056a9623ee 100644
--- a/addons/calendar/tests/test_event_notifications.py
+++ b/addons/calendar/tests/test_event_notifications.py
@@ -6,11 +6,11 @@ from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
 
 from odoo import fields
-from odoo.tests.common import SavepointCase, new_test_user
+from odoo.tests.common import TransactionCase, new_test_user
 from odoo.addons.mail.tests.common import MailCase
 
 
-class TestEventNotifications(SavepointCase, MailCase):
+class TestEventNotifications(TransactionCase, MailCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/calendar/tests/test_event_recurrence.py b/addons/calendar/tests/test_event_recurrence.py
index c622cdd6a2e..d4fa2e85748 100644
--- a/addons/calendar/tests/test_event_recurrence.py
+++ b/addons/calendar/tests/test_event_recurrence.py
@@ -6,10 +6,10 @@ import pytz
 from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
 
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class TestRecurrentEvents(SavepointCase):
+class TestRecurrentEvents(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/event/tests/common.py b/addons/event/tests/common.py
index f89f486439b..5d4144d47cc 100644
--- a/addons/event/tests/common.py
+++ b/addons/event/tests/common.py
@@ -8,7 +8,7 @@ from odoo.addons.mail.tests.common import mail_new_test_user
 from odoo.tests import common
 
 
-class TestEventCommon(common.SavepointCase):
+class TestEventCommon(common.TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/fleet/tests/test_access_rights.py b/addons/fleet/tests/test_access_rights.py
index 2fc9014926a..23b7c808997 100644
--- a/addons/fleet/tests/test_access_rights.py
+++ b/addons/fleet/tests/test_access_rights.py
@@ -3,7 +3,7 @@
 from odoo.tests import common, new_test_user
 
 
-class TestFleet(common.SavepointCase):
+class TestFleet(common.TransactionCase):
 
     def test_manager_create_vehicle(self):
         manager = new_test_user(self.env, "test fleet manager", groups="fleet.fleet_group_manager,base.group_partner_manager")
diff --git a/addons/gamification/tests/test_karma_tracking.py b/addons/gamification/tests/test_karma_tracking.py
index 8249daf3726..12946435ad7 100644
--- a/addons/gamification/tests/test_karma_tracking.py
+++ b/addons/gamification/tests/test_karma_tracking.py
@@ -10,7 +10,7 @@ from odoo.addons.mail.tests.common import mail_new_test_user
 from odoo.tests import common
 
 
-class TestKarmaTrackingCommon(common.SavepointCase):
+class TestKarmaTrackingCommon(common.TransactionCase):
 
     @classmethod
     def setUpClass(cls):
@@ -194,7 +194,7 @@ class TestKarmaTrackingCommon(common.SavepointCase):
         self.assertEqual(user.karma_tracking_ids[0].new_value, 32)
 
 
-class TestComputeRankCommon(common.SavepointCase):
+class TestComputeRankCommon(common.TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/google_calendar/tests/test_sync_google2odoo.py b/addons/google_calendar/tests/test_sync_google2odoo.py
index bb69331ee46..0c0cd8352b6 100644
--- a/addons/google_calendar/tests/test_sync_google2odoo.py
+++ b/addons/google_calendar/tests/test_sync_google2odoo.py
@@ -4,10 +4,10 @@
 from odoo.addons.google_calendar.utils.google_calendar import GoogleEvent
 import pytz
 from datetime import datetime, date
-from odoo.tests.common import SavepointCase, new_test_user
+from odoo.tests.common import TransactionCase, new_test_user
 
 
-class TestSyncGoogle2Odoo(SavepointCase):
+class TestSyncGoogle2Odoo(TransactionCase):
 
     @property
     def now(self):
diff --git a/addons/google_calendar/tests/test_sync_odoo2google.py b/addons/google_calendar/tests/test_sync_odoo2google.py
index 7862b1cfaa6..a78d19f60a7 100644
--- a/addons/google_calendar/tests/test_sync_odoo2google.py
+++ b/addons/google_calendar/tests/test_sync_odoo2google.py
@@ -5,7 +5,7 @@ from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
 from unittest.mock import MagicMock, patch
 
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 from odoo.addons.google_calendar.utils.google_calendar import GoogleCalendarService
 from odoo.addons.google_calendar.models.res_users import User
 from odoo.addons.google_calendar.models.google_sync import GoogleSync
@@ -22,7 +22,7 @@ def patch_api(func):
     return patched
 
 @patch.object(User, '_get_google_calendar_token', lambda user: 'dummy-token')
-class TestSyncOdoo2Google(SavepointCase):
+class TestSyncOdoo2Google(TransactionCase):
 
     def setUp(self):
         super().setUp()
diff --git a/addons/hr_contract/tests/common.py b/addons/hr_contract/tests/common.py
index a50534ab4e2..3c31f6a9e57 100644
--- a/addons/hr_contract/tests/common.py
+++ b/addons/hr_contract/tests/common.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class TestContractCommon(SavepointCase):
+class TestContractCommon(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/hr_holidays/tests/test_company_leave.py b/addons/hr_holidays/tests/test_company_leave.py
index 00217a267b5..f1b1061577e 100644
--- a/addons/hr_holidays/tests/test_company_leave.py
+++ b/addons/hr_holidays/tests/test_company_leave.py
@@ -4,11 +4,11 @@
 from datetime import date, datetime
 
 from odoo.tests import tagged
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
 @tagged('company_leave')
-class TestCompanyLeave(SavepointCase):
+class TestCompanyLeave(TransactionCase):
     """ Test leaves for a whole company, conflict resolutions """
 
     @classmethod
diff --git a/addons/l10n_ch/tests/test_onchange_l10n_ch_postal.py b/addons/l10n_ch/tests/test_onchange_l10n_ch_postal.py
index 7763f51b0be..73e1bcbf4c3 100644
--- a/addons/l10n_ch/tests/test_onchange_l10n_ch_postal.py
+++ b/addons/l10n_ch/tests/test_onchange_l10n_ch_postal.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from odoo.tests import common
-from odoo.tests.common import Form, SavepointCase
+from odoo.tests.common import Form, TransactionCase
 
 
 CH_ISR_ISSUER = '01-162-8'
@@ -11,7 +11,7 @@ CH_POST_IBAN = 'CH09 0900 0000 1000 8060 7'
 CH_POSTAL_ACC = '10-8060-7'
 
 
-class TestOnchangePostal(SavepointCase):
+class TestOnchangePostal(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/l10n_ch/tests/test_vendor_bill_isr.py b/addons/l10n_ch/tests/test_vendor_bill_isr.py
index bc76a6cc83b..c56174440c2 100644
--- a/addons/l10n_ch/tests/test_vendor_bill_isr.py
+++ b/addons/l10n_ch/tests/test_vendor_bill_isr.py
@@ -13,7 +13,7 @@ ISR_REFERENCE_NO_ZEROS = "1 23456 78903"
 ISR_REFERENCE_BAD = "11 11111 11111 11111 11111 11111"
 
 
-class TestVendorBillISR(common.SavepointCase):
+class TestVendorBillISR(common.TransactionCase):
     """Check we can encode Vendor bills with ISR references
 
     The ISR is a structured reference with a checksum.
diff --git a/addons/mail/tests/common.py b/addons/mail/tests/common.py
index 84b17c9c080..b386edc2786 100644
--- a/addons/mail/tests/common.py
+++ b/addons/mail/tests/common.py
@@ -645,7 +645,7 @@ class MailCase(MockEmail):
                 self.assertEqual(1, 0)
 
 
-class MailCommon(common.SavepointCase, MailCase):
+class MailCommon(common.TransactionCase, MailCase):
     """ Almost-void class definition setting the savepoint case + mock of mail.
     Used mainly for class inheritance in other applications and test modules. """
 
diff --git a/addons/microsoft_calendar/tests/test_sync_microsoft2odoo.py b/addons/microsoft_calendar/tests/test_sync_microsoft2odoo.py
index 13b6f5a155f..9528666f0b1 100644
--- a/addons/microsoft_calendar/tests/test_sync_microsoft2odoo.py
+++ b/addons/microsoft_calendar/tests/test_sync_microsoft2odoo.py
@@ -4,11 +4,11 @@
 from odoo.addons.microsoft_calendar.utils.microsoft_calendar import MicrosoftEvent
 import pytz
 from datetime import datetime, date
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 from dateutil.relativedelta import relativedelta
 
 
-class TestSyncMicrosoft2Odoo(SavepointCase):
+class TestSyncMicrosoft2Odoo(TransactionCase):
 
     @property
     def now(self):
diff --git a/addons/mrp/tests/test_backorder.py b/addons/mrp/tests/test_backorder.py
index ec2e27f1edd..7d4a838cfbf 100644
--- a/addons/mrp/tests/test_backorder.py
+++ b/addons/mrp/tests/test_backorder.py
@@ -3,7 +3,7 @@
 
 from odoo.addons.mrp.tests.common import TestMrpCommon
 from odoo.tests import Form
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
 class TestMrpProductionBackorder(TestMrpCommon):
@@ -281,7 +281,7 @@ class TestMrpProductionBackorder(TestMrpCommon):
         self.assertEqual(len(production.procurement_group_id.mrp_production_ids), nb_product_todo)
 
 
-class TestMrpWorkorderBackorder(SavepointCase):
+class TestMrpWorkorderBackorder(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestMrpWorkorderBackorder, cls).setUpClass()
diff --git a/addons/mrp_subcontracting/tests/common.py b/addons/mrp_subcontracting/tests/common.py
index 224dfa08504..f3910480d33 100644
--- a/addons/mrp_subcontracting/tests/common.py
+++ b/addons/mrp_subcontracting/tests/common.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.tests.common import Form, SavepointCase
+from odoo.tests.common import Form, TransactionCase
 
-class TestMrpSubcontractingCommon(SavepointCase):
+class TestMrpSubcontractingCommon(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/point_of_sale/tests/common.py b/addons/point_of_sale/tests/common.py
index b0518136792..c2e11e55c4b 100644
--- a/addons/point_of_sale/tests/common.py
+++ b/addons/point_of_sale/tests/common.py
@@ -3,7 +3,7 @@ from random import randint
 
 from odoo import fields, tools
 from odoo.addons.stock_account.tests.test_anglo_saxon_valuation_reconciliation_common import ValuationReconciliationTestCommon
-from odoo.tests.common import SavepointCase, Form
+from odoo.tests.common import Form
 from odoo.tests import tagged
 
 
diff --git a/addons/product/tests/common.py b/addons/product/tests/common.py
index 3e3f11c3f6c..06357fb39b2 100644
--- a/addons/product/tests/common.py
+++ b/addons/product/tests/common.py
@@ -3,7 +3,7 @@
 from odoo.tests import common
 
 
-class TestProductCommon(common.SavepointCase):
+class TestProductCommon(common.TransactionCase):
 
     @classmethod
     def setUpClass(cls):
@@ -102,7 +102,7 @@ class TestProductCommon(common.SavepointCase):
             'uom_po_id': cls.uom_unit.id})
 
 
-class TestAttributesCommon(common.SavepointCase):
+class TestAttributesCommon(common.TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/product/tests/test_product_attribute_value_config.py b/addons/product/tests/test_product_attribute_value_config.py
index 3c672523e6e..469576c451c 100644
--- a/addons/product/tests/test_product_attribute_value_config.py
+++ b/addons/product/tests/test_product_attribute_value_config.py
@@ -6,11 +6,11 @@ from psycopg2 import IntegrityError
 
 from odoo.exceptions import UserError, ValidationError
 from odoo.tests import tagged
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 from odoo.tools import mute_logger
 
 
-class TestProductAttributeValueCommon(SavepointCase):
+class TestProductAttributeValueCommon(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestProductAttributeValueCommon, cls).setUpClass()
diff --git a/addons/project/tests/test_multicompany.py b/addons/project/tests/test_multicompany.py
index 5fc6b0187e2..b63072758e7 100644
--- a/addons/project/tests/test_multicompany.py
+++ b/addons/project/tests/test_multicompany.py
@@ -2,11 +2,11 @@
 
 from contextlib import contextmanager
 
-from odoo.tests.common import SavepointCase, Form
+from odoo.tests.common import TransactionCase, Form
 from odoo.exceptions import AccessError, UserError
 
 
-class TestMultiCompanyCommon(SavepointCase):
+class TestMultiCompanyCommon(TransactionCase):
 
     @classmethod
     def setUpMultiCompany(cls):
diff --git a/addons/project/tests/test_project_base.py b/addons/project/tests/test_project_base.py
index 72350b1af20..cf50fc80c2d 100644
--- a/addons/project/tests/test_project_base.py
+++ b/addons/project/tests/test_project_base.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 from odoo.exceptions import UserError
 
-class TestProjectCommon(SavepointCase):
+class TestProjectCommon(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/project/tests/test_project_recurrence.py b/addons/project/tests/test_project_recurrence.py
index b207e7a9522..92c9355b0a7 100644
--- a/addons/project/tests/test_project_recurrence.py
+++ b/addons/project/tests/test_project_recurrence.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-from odoo.tests.common import SavepointCase, Form
+from odoo.tests.common import TransactionCase, Form
 from odoo.exceptions import ValidationError
 from odoo import fields
 
@@ -10,7 +10,7 @@ from dateutil.rrule import MO, TU, WE, TH, FR, SA, SU
 
 from unittest.mock import patch
 
-class TestProjectrecurrence(SavepointCase):
+class TestProjectrecurrence(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestProjectrecurrence, cls).setUpClass()
diff --git a/addons/purchase_requisition/tests/common.py b/addons/purchase_requisition/tests/common.py
index 235208b8a89..ff6056f0b6c 100644
--- a/addons/purchase_requisition/tests/common.py
+++ b/addons/purchase_requisition/tests/common.py
@@ -3,7 +3,7 @@
 from odoo.tests import common
 
 
-class TestPurchaseRequisitionCommon(common.SavepointCase):
+class TestPurchaseRequisitionCommon(common.TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/purchase_stock/tests/test_reordering_rule.py b/addons/purchase_stock/tests/test_reordering_rule.py
index 74406ea8deb..6fd46c2f0dc 100644
--- a/addons/purchase_stock/tests/test_reordering_rule.py
+++ b/addons/purchase_stock/tests/test_reordering_rule.py
@@ -6,10 +6,10 @@ from datetime import timedelta as td
 
 from odoo import SUPERUSER_ID
 from odoo.tests import Form
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class TestReorderingRule(SavepointCase):
+class TestReorderingRule(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestReorderingRule, cls).setUpClass()
diff --git a/addons/rating/tests/test_security.py b/addons/rating/tests/test_security.py
index 7aa0a145fd8..a0585b591a9 100644
--- a/addons/rating/tests/test_security.py
+++ b/addons/rating/tests/test_security.py
@@ -8,7 +8,7 @@ from odoo.tools import mute_logger
 
 
 @tagged('security')
-class TestAccessRating(common.SavepointCase):
+class TestAccessRating(common.TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/sale/tests/common.py b/addons/sale/tests/common.py
index dfcd198e194..8bfbf66edbc 100644
--- a/addons/sale/tests/common.py
+++ b/addons/sale/tests/common.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from odoo.addons.account.tests.common import AccountTestInvoicingCommon
-from odoo.addons.base.tests.common import SavepointCase
+from odoo.addons.base.tests.common import TransactionCase
 
 
-class TestSaleCommonBase(SavepointCase):
+class TestSaleCommonBase(TransactionCase):
     ''' Setup with sale test configuration. '''
 
     @classmethod
diff --git a/addons/sale_product_configurator/tests/common.py b/addons/sale_product_configurator/tests/common.py
index 252fda2b17a..73bcd0b6c20 100644
--- a/addons/sale_product_configurator/tests/common.py
+++ b/addons/sale_product_configurator/tests/common.py
@@ -1,11 +1,11 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 import base64
 
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 from odoo.modules.module import get_module_resource
 
 
-class TestProductConfiguratorCommon(SavepointCase):
+class TestProductConfiguratorCommon(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/sale_product_configurator/tests/test_sale_product_configurator_ui.py b/addons/sale_product_configurator/tests/test_sale_product_configurator_ui.py
index 009c2de6e8f..427a7dcdb9f 100644
--- a/addons/sale_product_configurator/tests/test_sale_product_configurator_ui.py
+++ b/addons/sale_product_configurator/tests/test_sale_product_configurator_ui.py
@@ -6,7 +6,7 @@ from .common import TestProductConfiguratorCommon
 
 
 @odoo.tests.tagged('post_install', '-at_install')
-class TestUi(odoo.tests.HttpSavepointCase, TestProductConfiguratorCommon):
+class TestUi(odoo.tests.HttpCase, TestProductConfiguratorCommon):
 
     def setUp(self):
         super(TestUi, self).setUp()
diff --git a/addons/sale_project/tests/test_child_tasks.py b/addons/sale_project/tests/test_child_tasks.py
index 776a2d77ccf..e7f8afb4c63 100644
--- a/addons/sale_project/tests/test_child_tasks.py
+++ b/addons/sale_project/tests/test_child_tasks.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details
 
-from odoo.tests.common import SavepointCase, new_test_user
+from odoo.tests.common import TransactionCase, new_test_user
 
 
-class TestNestedTaskUpdate(SavepointCase):
+class TestNestedTaskUpdate(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/sale_project/tests/test_sale_project.py b/addons/sale_project/tests/test_sale_project.py
index 311d9fd32b3..d4b9ac0e6a9 100644
--- a/addons/sale_project/tests/test_sale_project.py
+++ b/addons/sale_project/tests/test_sale_project.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class TestSaleProject(SavepointCase):
+class TestSaleProject(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/sales_team/tests/common.py b/addons/sales_team/tests/common.py
index 665245d1396..fd9b366d80a 100644
--- a/addons/sales_team/tests/common.py
+++ b/addons/sales_team/tests/common.py
@@ -2,10 +2,10 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo.addons.mail.tests.common import mail_new_test_user
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class TestSalesCommon(SavepointCase):
+class TestSalesCommon(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/stock/tests/common.py b/addons/stock/tests/common.py
index e05394c3782..e794a2f20dc 100644
--- a/addons/stock/tests/common.py
+++ b/addons/stock/tests/common.py
@@ -3,7 +3,7 @@
 from odoo.tests import common
 
 
-class TestStockCommon(common.SavepointCase):
+class TestStockCommon(common.TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestStockCommon, cls).setUpClass()
diff --git a/addons/stock/tests/test_generate_serial_numbers.py b/addons/stock/tests/test_generate_serial_numbers.py
index 42e678a3a3e..1d45ac79afd 100644
--- a/addons/stock/tests/test_generate_serial_numbers.py
+++ b/addons/stock/tests/test_generate_serial_numbers.py
@@ -2,10 +2,10 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo.exceptions import UserError, ValidationError
-from odoo.tests.common import Form, SavepointCase
+from odoo.tests.common import Form, TransactionCase
 
 
-class StockGenerate(SavepointCase):
+class StockGenerate(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(StockGenerate, cls).setUpClass()
diff --git a/addons/stock/tests/test_inventory.py b/addons/stock/tests/test_inventory.py
index 3ef6e389e92..7cfd2b12924 100644
--- a/addons/stock/tests/test_inventory.py
+++ b/addons/stock/tests/test_inventory.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from odoo.exceptions import ValidationError
-from odoo.tests.common import Form, SavepointCase
+from odoo.tests.common import Form, TransactionCase
 
 
-class TestInventory(SavepointCase):
+class TestInventory(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestInventory, cls).setUpClass()
diff --git a/addons/stock/tests/test_move.py b/addons/stock/tests/test_move.py
index 97dc10346fb..cea6e61f660 100644
--- a/addons/stock/tests/test_move.py
+++ b/addons/stock/tests/test_move.py
@@ -3,10 +3,10 @@
 
 from odoo.exceptions import UserError
 from odoo.tests import Form
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class StockMove(SavepointCase):
+class StockMove(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(StockMove, cls).setUpClass()
diff --git a/addons/stock/tests/test_multicompany.py b/addons/stock/tests/test_multicompany.py
index 44f981f26eb..131a0f9dd3c 100644
--- a/addons/stock/tests/test_multicompany.py
+++ b/addons/stock/tests/test_multicompany.py
@@ -2,10 +2,10 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo.exceptions import UserError
-from odoo.tests.common import SavepointCase, Form
+from odoo.tests.common import TransactionCase, Form
 
 
-class TestMultiCompany(SavepointCase):
+class TestMultiCompany(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestMultiCompany, cls).setUpClass()
diff --git a/addons/stock/tests/test_packing.py b/addons/stock/tests/test_packing.py
index ff06a5f444b..5d1280a07e2 100644
--- a/addons/stock/tests/test_packing.py
+++ b/addons/stock/tests/test_packing.py
@@ -2,12 +2,12 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo.tests import Form
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 from odoo.tools import float_round
 from odoo.exceptions import UserError
 
 
-class TestPackingCommon(SavepointCase):
+class TestPackingCommon(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestPackingCommon, cls).setUpClass()
diff --git a/addons/stock/tests/test_quant.py b/addons/stock/tests/test_quant.py
index 703567da024..a9259af0caa 100644
--- a/addons/stock/tests/test_quant.py
+++ b/addons/stock/tests/test_quant.py
@@ -6,11 +6,11 @@ from datetime import datetime, timedelta
 
 from odoo.addons.mail.tests.common import mail_new_test_user
 from odoo.exceptions import ValidationError
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 from odoo.exceptions import AccessError, UserError
 
 
-class StockQuant(SavepointCase):
+class StockQuant(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(StockQuant, cls).setUpClass()
diff --git a/addons/stock/tests/test_quant_inventory_mode.py b/addons/stock/tests/test_quant_inventory_mode.py
index 32e93e56ec7..dede2ec6d07 100644
--- a/addons/stock/tests/test_quant_inventory_mode.py
+++ b/addons/stock/tests/test_quant_inventory_mode.py
@@ -2,11 +2,11 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo.addons.mail.tests.common import mail_new_test_user
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 from odoo.exceptions import AccessError, UserError
 
 
-class TestEditableQuant(SavepointCase):
+class TestEditableQuant(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestEditableQuant, cls).setUpClass()
diff --git a/addons/stock/tests/test_report.py b/addons/stock/tests/test_report.py
index ab5ebedcd40..991bec69120 100644
--- a/addons/stock/tests/test_report.py
+++ b/addons/stock/tests/test_report.py
@@ -3,10 +3,10 @@
 
 from datetime import date, datetime, timedelta
 
-from odoo.tests.common import Form, SavepointCase
+from odoo.tests.common import Form, TransactionCase
 
 
-class TestReportsCommon(SavepointCase):
+class TestReportsCommon(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
diff --git a/addons/stock/tests/test_robustness.py b/addons/stock/tests/test_robustness.py
index ef039188a32..4d67f35434f 100644
--- a/addons/stock/tests/test_robustness.py
+++ b/addons/stock/tests/test_robustness.py
@@ -2,10 +2,10 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo.exceptions import UserError, ValidationError
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class TestRobustness(SavepointCase):
+class TestRobustness(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestRobustness, cls).setUpClass()
diff --git a/addons/stock_account/tests/test_stockvaluation.py b/addons/stock_account/tests/test_stockvaluation.py
index 0db6ec7e952..bebe8b9ecb5 100644
--- a/addons/stock_account/tests/test_stockvaluation.py
+++ b/addons/stock_account/tests/test_stockvaluation.py
@@ -5,7 +5,7 @@ from datetime import timedelta
 
 from odoo.exceptions import UserError
 from odoo.fields import Datetime
-from odoo.tests.common import Form, SavepointCase
+from odoo.tests.common import Form, TransactionCase
 
 
 def _create_accounting_data(env):
@@ -46,7 +46,7 @@ def _create_accounting_data(env):
     return stock_input_account, stock_output_account, stock_valuation_account, expense_account, stock_journal
 
 
-class TestStockValuation(SavepointCase):
+class TestStockValuation(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestStockValuation, cls).setUpClass()
diff --git a/addons/stock_account/tests/test_stockvaluationlayer.py b/addons/stock_account/tests/test_stockvaluationlayer.py
index c05f9042923..6b11f29dc10 100644
--- a/addons/stock_account/tests/test_stockvaluationlayer.py
+++ b/addons/stock_account/tests/test_stockvaluationlayer.py
@@ -5,10 +5,10 @@
 
 from odoo.addons.stock_account.tests.test_stockvaluation import _create_accounting_data
 from odoo.tests import Form, tagged
-from odoo.tests.common import SavepointCase, TransactionCase
+from odoo.tests.common import TransactionCase
 
 
-class TestStockValuationCommon(SavepointCase):
+class TestStockValuationCommon(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestStockValuationCommon, cls).setUpClass()
diff --git a/addons/survey/tests/common.py b/addons/survey/tests/common.py
index 2a4e1581a4c..2ed13da1047 100644
--- a/addons/survey/tests/common.py
+++ b/addons/survey/tests/common.py
@@ -10,7 +10,7 @@ from odoo.addons.mail.tests.common import mail_new_test_user
 from odoo.tests import common
 
 
-class SurveyCase(common.SavepointCase):
+class SurveyCase(common.TransactionCase):
     def setUp(self):
         super(SurveyCase, self).setUp()
 
diff --git a/addons/test_mail/tests/common.py b/addons/test_mail/tests/common.py
index b62b1a444aa..7248a80756e 100644
--- a/addons/test_mail/tests/common.py
+++ b/addons/test_mail/tests/common.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo.addons.mail.tests.common import MailCommon
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
 class TestMailCommon(MailCommon):
@@ -23,7 +23,7 @@ class TestMailMultiCompanyCommon(MailCommon):
         })
 
 
-class TestRecipients(SavepointCase):
+class TestRecipients(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/website_event/tests/common.py b/addons/website_event/tests/common.py
index 1dbf91c8e49..a3bf2e87a30 100644
--- a/addons/website_event/tests/common.py
+++ b/addons/website_event/tests/common.py
@@ -7,10 +7,10 @@ from unittest.mock import patch
 from odoo.addons.event.tests.common import TestEventCommon
 from odoo.addons.mail.tests.common import mail_new_test_user
 from odoo.fields import Datetime as FieldsDatetime, Date as FieldsDate
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class EventDtPatcher(SavepointCase):
+class EventDtPatcher(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/website_forum/tests/common.py b/addons/website_forum/tests/common.py
index 75b6237bf53..c17d565c7bf 100644
--- a/addons/website_forum/tests/common.py
+++ b/addons/website_forum/tests/common.py
@@ -18,7 +18,7 @@ KARMA = {
 }
 
 
-class TestForumCommon(common.SavepointCase):
+class TestForumCommon(common.TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/website_sale_product_configurator/tests/test_customize.py b/addons/website_sale_product_configurator/tests/test_customize.py
index bac65e2d96b..f4746b6c82d 100644
--- a/addons/website_sale_product_configurator/tests/test_customize.py
+++ b/addons/website_sale_product_configurator/tests/test_customize.py
@@ -1,12 +1,12 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.tests.common import HttpSavepointCase
+from odoo.tests.common import HttpCase
 from odoo.addons.sale_product_configurator.tests.common import TestProductConfiguratorCommon
 from odoo.tests import tagged
 
 
 @tagged('post_install', '-at_install')
-class TestUi(HttpSavepointCase, TestProductConfiguratorCommon):
+class TestUi(HttpCase, TestProductConfiguratorCommon):
 
     def test_01_admin_shop_custom_attribute_value_tour(self):
         # fix runbot, sometimes one pricelist is chosen, sometimes the other...
diff --git a/addons/website_slides/tests/common.py b/addons/website_slides/tests/common.py
index fa336fa0207..c4ebce8d01e 100644
--- a/addons/website_slides/tests/common.py
+++ b/addons/website_slides/tests/common.py
@@ -5,7 +5,7 @@ from odoo.tests import common
 from odoo.addons.mail.tests.common import mail_new_test_user
 
 
-class SlidesCase(common.SavepointCase):
+class SlidesCase(common.TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/odoo/addons/base/tests/common.py b/odoo/addons/base/tests/common.py
index fcaa4df8be1..36ab987d8bd 100644
--- a/odoo/addons/base/tests/common.py
+++ b/odoo/addons/base/tests/common.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.tests.common import SavepointCase, TransactionCase, HttpCase
+from odoo.tests.common import TransactionCase, HttpCase
 
 
 class TransactionCaseWithUserDemo(TransactionCase):
@@ -52,7 +52,7 @@ class HttpCaseWithUserDemo(HttpCase):
             })
 
 
-class SavepointCaseWithUserDemo(SavepointCase):
+class SavepointCaseWithUserDemo(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/odoo/addons/base/tests/test_ir_model.py b/odoo/addons/base/tests/test_ir_model.py
index eea989f1237..c05c6971135 100644
--- a/odoo/addons/base/tests/test_ir_model.py
+++ b/odoo/addons/base/tests/test_ir_model.py
@@ -4,7 +4,7 @@
 from psycopg2 import IntegrityError
 
 from odoo.exceptions import ValidationError
-from odoo.tests.common import TransactionCase, SavepointCase, tagged
+from odoo.tests.common import TransactionCase, tagged
 from odoo.tools import mute_logger
 
 
@@ -172,7 +172,7 @@ class TestXMLID(TransactionCase):
             model._load_records(data_list)
 
 
-class TestIrModel(SavepointCase):
+class TestIrModel(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/odoo/addons/base/tests/test_mail.py b/odoo/addons/base/tests/test_mail.py
index 9f85bad64f4..1cd29e2090e 100644
--- a/odoo/addons/base/tests/test_mail.py
+++ b/odoo/addons/base/tests/test_mail.py
@@ -8,7 +8,7 @@ import email.message
 import re
 import threading
 
-from odoo.tests.common import BaseCase, SavepointCase, TransactionCase
+from odoo.tests.common import BaseCase, TransactionCase
 from odoo.tools import (
     is_html_empty, html_sanitize, append_content_to_html, plaintext2html,
     email_split,
@@ -426,7 +426,7 @@ class TestEmailTools(BaseCase):
                     self.assertEqual(formataddr(pair, charset), expected)
 
 
-class EmailConfigCase(SavepointCase):
+class EmailConfigCase(TransactionCase):
     @patch.dict("odoo.tools.config.options", {"email_from": "settings@example.com"})
     def test_default_email_from(self, *args):
         """Email from setting is respected."""
diff --git a/odoo/addons/base/tests/test_views.py b/odoo/addons/base/tests/test_views.py
index 77e26d75efc..8e0a99720bf 100644
--- a/odoo/addons/base/tests/test_views.py
+++ b/odoo/addons/base/tests/test_views.py
@@ -2373,7 +2373,7 @@ class TestViews(ViewCase):
             self.assertIn(expected_message, message)
 
 
-class TestViewTranslations(common.SavepointCase):
+class TestViewTranslations(common.TransactionCase):
     # these tests are essentially the same as in test_translate.py, but they use
     # the computed field 'arch' instead of the translated field 'arch_db'
 
diff --git a/odoo/tests/common.py b/odoo/tests/common.py
index 53f5bdec66e..1175296e020 100644
--- a/odoo/tests/common.py
+++ b/odoo/tests/common.py
@@ -27,6 +27,7 @@ import threading
 import time
 import unittest
 import difflib
+import warnings
 import werkzeug.urls
 from contextlib import contextmanager
 from datetime import datetime, date
@@ -635,8 +636,14 @@ class TransactionCase(BaseCase):
         self.patch(self.registry['res.partner'], '_get_gravatar_image', lambda *a: False)
 
 
-# kept for backward compatibility
-SavepointCase = TransactionCase
+class SavepointCase(TransactionCase):
+    @classmethod
+    def __init_subclass__(cls):
+        super().__init_subclass__()
+        warnings.warn(
+            "Deprecated class SavepointCase has been merged into TransactionCase",
+            DeprecationWarning, stacklevel=2,
+        )
 
 
 class SingleTransactionCase(BaseCase):
@@ -1433,7 +1440,14 @@ class HttpCase(TransactionCase):
 
 
 # kept for backward compatibility
-HttpSavepointCase = HttpCase
+class HttpSavepointCase(HttpCase):
+    @classmethod
+    def __init_subclass__(cls):
+        super().__init_subclass__()
+        warnings.warn(
+            "Deprecated class HttpSavepointCase has been merged into HttpCase",
+            DeprecationWarning, stacklevel=2,
+        )
 
 
 def users(*logins):