diff --git a/addons/website/static/tests/tours/specific_website_editor.js b/addons/website/static/tests/tours/specific_website_editor.js
index fd8ebd4d303..fdf2271be12 100644
--- a/addons/website/static/tests/tours/specific_website_editor.js
+++ b/addons/website/static/tests/tours/specific_website_editor.js
@@ -6,8 +6,8 @@ const tour = require('web_tour.tour');
 tour.register('generic_website_editor', {
     test: true,
 }, [{
-    trigger: 'a.o_frontend_to_backend_edit_btn',
-    content: 'Go to backend',
+    content: 'Click edit button',
+    trigger: '.o_edit_website_container > a',
 },
 {
     trigger: 'iframe body:not([data-hello="world"])',
@@ -19,8 +19,8 @@ tour.register('generic_website_editor', {
 tour.register('specific_website_editor', {
     test: true,
 }, [{
-    trigger: 'a.o_frontend_to_backend_edit_btn',
-    content: 'Go to backend',
+    content: 'Click edit button',
+    trigger: '.o_edit_website_container > a',
 },
 {
     trigger: 'iframe body[data-hello="world"]',
diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 10ced6419db..715a98a58ab 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -3,6 +3,8 @@
 
 import base64
 
+from werkzeug.urls import url_encode
+
 import odoo
 import odoo.tests
 
@@ -173,9 +175,9 @@ class TestUi(odoo.tests.HttpCase):
             'path': custom_url,
             'website_id': new_website.id,
         })
-
-        self.start_tour("/website/force/%s" % website_default.id, "generic_website_editor", login='admin')
-        self.start_tour("/website/force/%s" % new_website.id, "specific_website_editor", login='admin')
+        url_params = url_encode({'path': '/@/'})
+        self.start_tour(f'/website/force/{website_default.id}?{url_params}', "generic_website_editor", login='admin')
+        self.start_tour(f'/website/force/{new_website.id}?{url_params}', "specific_website_editor", login='admin')
 
     def test_06_public_user_editor(self):
         website_default = self.env['website'].search([], limit=1)