diff --git a/addons/website_event_sale/tests/test_frontend_buy_tickets.py b/addons/website_event_sale/tests/test_frontend_buy_tickets.py
index 38645c16a1d5b..f013dc0318ac7 100644
--- a/addons/website_event_sale/tests/test_frontend_buy_tickets.py
+++ b/addons/website_event_sale/tests/test_frontend_buy_tickets.py
@@ -92,8 +92,6 @@ def test_admin(self):
 
         self.start_tour("/", 'event_buy_tickets', login="admin")
 
-    # TODO master-mysterious-egg fix error
-    @unittest.skip("prepare mysterious-egg for merging")
     def test_demo(self):
         self.env['product.pricelist'].with_context(active_test=False).search([]).unlink()
         transfer_provider = self.env.ref('payment.payment_provider_transfer')
@@ -108,8 +106,6 @@ def test_demo(self):
 
         self.start_tour("/", 'event_buy_tickets', login="demo")
 
-    # TODO master-mysterious-egg fix error
-    @unittest.skip("prepare mysterious-egg for merging")
     def test_buy_last_ticket(self):
         transfer_provider = self.env.ref('payment.payment_provider_transfer')
         transfer_provider.write({
diff --git a/addons/website_sale/static/tests/tours/website_sale_category_page_and_products_snippet.js b/addons/website_sale/static/tests/tours/website_sale_category_page_and_products_snippet.js
index c7ea5c32b3350..aa63f9288d694 100644
--- a/addons/website_sale/static/tests/tours/website_sale_category_page_and_products_snippet.js
+++ b/addons/website_sale/static/tests/tours/website_sale_category_page_and_products_snippet.js
@@ -10,13 +10,17 @@ registerWebsitePreviewTour('category_page_and_products_snippet_edition', {
         trigger: ':iframe .o_wsale_filmstip > li:contains("Test Category") > a',
         run: "click",
     },
+    {
+        content: "Wait for page to load",
+        trigger: ":iframe",
+    },
     ...clickOnEditAndWaitEditMode(),
     {
-        trigger: ".o_website_preview.editor_enable.editor_has_snippets",
+        trigger: ".o-website-builder_sidebar .o_snippets_container .o_snippet",
     },
     {
         content: "Drag and drop the Products snippet group inside the category area.",
-        trigger: '#oe_snippets .oe_snippet[name="Products"] .oe_snippet_thumbnail:not(.o_we_ongoing_insertion)',
+        trigger: ".o-website-builder_sidebar .o_snippet[name='Products'] .o_snippet_thumbnail:not(.o_we_ongoing_insertion)",
         run: "drag_and_drop :iframe #category_header",
     },
     {
@@ -32,12 +36,12 @@ registerWebsitePreviewTour('category_page_and_products_snippet_edition', {
     },
     {
         content: "Open category option dropdown",
-        trigger: 'we-select[data-attribute-name="productCategoryId"] we-toggler',
+        trigger: "button[id='product_category_opt']'",
         run: "click",
     },
     {
         content: "Choose the option to use the current page's category",
-        trigger: 'we-button[data-select-data-attribute="current"]',
+        trigger: "div.o-dropdown-item:contains('Current Category or All')",
         run: "click",
     },
     ...clickOnSave(),
diff --git a/addons/website_sale/tests/test_delivery_ui.py b/addons/website_sale/tests/test_delivery_ui.py
index a10988ed0fbb5..88b2f1abcbade 100644
--- a/addons/website_sale/tests/test_delivery_ui.py
+++ b/addons/website_sale/tests/test_delivery_ui.py
@@ -6,8 +6,6 @@
 
 @odoo.tests.tagged('post_install', '-at_install')
 class TestUi(odoo.tests.HttpCase):
-    # TODO master-mysterious-egg fix error
-    @unittest.skip("prepare mysterious-egg for merging")
     def test_01_free_delivery_when_exceed_threshold(self):
         if self.env['ir.module.module']._get('payment_custom').state != 'installed':
             self.skipTest("Transfer provider is not installed")
diff --git a/addons/website_sale/tests/test_website_editor.py b/addons/website_sale/tests/test_website_editor.py
index 07548e829f9d8..94488567e9b84 100644
--- a/addons/website_sale/tests/test_website_editor.py
+++ b/addons/website_sale/tests/test_website_editor.py
@@ -235,8 +235,6 @@ def setUpClass(cls):
         cls.user_website_user.group_ids += cls.env.ref('sales_team.group_sale_manager')
         cls.user_website_user.group_ids += cls.env.ref('product.group_product_manager')
 
-    # TODO master-mysterious-egg fix error
-    @unittest.skip("prepare mysterious-egg for merging")
     def test_category_page_and_products_snippet(self):
         category = self.env['product.public.category'].create({
             'name': 'Test Category',
@@ -256,7 +254,7 @@ def test_category_page_and_products_snippet(self):
             'name': 'Test Product Outside Category',
             'website_published': True,
         })
-        self.start_tour(self.env['website'].get_client_action_url('/shop'), 'category_page_and_products_snippet_edition', login="website_user")
+        self.start_tour(self.env['website'].get_client_action_url('/shop'), 'category_page_and_products_snippet_edition', login="admin")
         self.start_tour('/shop', 'category_page_and_products_snippet_use', login=None)
 
     # TODO master-mysterious-egg fix error