diff --git a/addons/point_of_sale/tests/test_frontend.py b/addons/point_of_sale/tests/test_frontend.py
index 80a699e7467..40e31e1c211 100644
--- a/addons/point_of_sale/tests/test_frontend.py
+++ b/addons/point_of_sale/tests/test_frontend.py
@@ -504,7 +504,7 @@ class TestUi(TestPointOfSaleHttpCommon):
 
     def test_02_pos_with_invoiced(self):
         self.main_pos_config.open_session_cb(check_coa=False)
-        self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'ChromeTour', login="admin", step_delay=50)
+        self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'ChromeTour', login="admin")
         n_invoiced = self.env['pos.order'].search_count([('state', '=', 'invoiced')])
         n_paid = self.env['pos.order'].search_count([('state', '=', 'paid')])
         self.assertEqual(n_invoiced, 1, 'There should be 1 invoiced order.')
@@ -513,13 +513,13 @@ class TestUi(TestPointOfSaleHttpCommon):
     def test_03_order_management(self):
         self.main_pos_config.write({ 'manage_orders': True, 'module_account': True })
         self.main_pos_config.open_session_cb(check_coa=False)
-        self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'OrderManagementScreenTour', login="admin", step_delay=50)
+        self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'OrderManagementScreenTour', login="admin")
 
     def test_04_product_configurator(self):
         self.main_pos_config.write({ 'product_configurator': True })
         self.main_pos_config.open_session_cb(check_coa=False)
-        self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config, 'ProductConfiguratorTour', login="admin", step_delay=50)
+        self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config, 'ProductConfiguratorTour', login="admin")
 
     def test_05_ticket_screen(self):
         self.main_pos_config.open_session_cb(check_coa=False)
-        self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'TicketScreenTour', login="admin", step_delay=50)
+        self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'TicketScreenTour', login="admin")
diff --git a/addons/pos_restaurant/static/src/xml/Screens/TipScreen.xml b/addons/pos_restaurant/static/src/xml/Screens/TipScreen.xml
index 9142977513e..8244ca0bddc 100644
--- a/addons/pos_restaurant/static/src/xml/Screens/TipScreen.xml
+++ b/addons/pos_restaurant/static/src/xml/Screens/TipScreen.xml
@@ -45,7 +45,7 @@
                         <div class="custom-amount-form">
                             <div class="item label">Amount</div>
                             <div class="item input">
-                                <input type="text" t-model="state.inputTipAmount" />
+                                <input type="text" t-model="state.inputTipAmount" t-att-data-amount="state.inputTipAmount" />
                                 <div class="currency">
                                     <t t-esc="env.pos.getCurrencySymbol()" />
                                 </div>
diff --git a/addons/pos_restaurant/static/tests/tours/TicketScreen.tour.js b/addons/pos_restaurant/static/tests/tours/TicketScreen.tour.js
index 6f176d84173..0f80cd95b55 100644
--- a/addons/pos_restaurant/static/tests/tours/TicketScreen.tour.js
+++ b/addons/pos_restaurant/static/tests/tours/TicketScreen.tour.js
@@ -17,6 +17,8 @@ odoo.define('pos_restaurant.tour.TicketScreen', function (require) {
 
     // Deleting the last order in the table brings back to floorscreen
     FloorScreen.do.clickTable('T4');
+    // Clicking ticket button without checking if floor screen is shown causes an error
+    FloorScreen.check.isShown();
     Chrome.do.clickTicketButton();
     TicketScreen.check.nthRowContains(2, '-0001');
     TicketScreen.do.deleteOrder('-0001');
diff --git a/addons/pos_restaurant/static/tests/tours/helpers/TipScreenTourMethods.js b/addons/pos_restaurant/static/tests/tours/helpers/TipScreenTourMethods.js
index e0ba53ecb63..8895d566c31 100644
--- a/addons/pos_restaurant/static/tests/tours/helpers/TipScreenTourMethods.js
+++ b/addons/pos_restaurant/static/tests/tours/helpers/TipScreenTourMethods.js
@@ -49,12 +49,8 @@ odoo.define('pos_restaurant.tour.TipScreenTourMethods', function (require) {
         inputAmountIs(amount) {
             return [
                 {
-                    trigger: `.tip-screen .custom-amount-form input`,
-                    run: function() {
-                        if (this.$anchor.val().indexOf(amount) === -1) {
-                            throw new Error(`".tip-screen .custom-amount-form input" element does not contain ${amount}.`)
-                        };
-                    },
+                    trigger: `.tip-screen .custom-amount-form input[data-amount="${amount}"]`,
+                    run: () => {},
                 }
             ]
         }
diff --git a/addons/pos_restaurant/tests/test_frontend.py b/addons/pos_restaurant/tests/test_frontend.py
index 710e226b678..dfb5a13adda 100644
--- a/addons/pos_restaurant/tests/test_frontend.py
+++ b/addons/pos_restaurant/tests/test_frontend.py
@@ -178,16 +178,16 @@ class TestFrontend(odoo.tests.HttpCase):
     def test_03_order_management_integration(self):
         self.pos_config.write({'manage_orders': True})
         self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb(check_coa=False)
-        self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'PosResOrderManagementScreenTour', login="admin", step_delay=50)
+        self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'PosResOrderManagementScreenTour', login="admin")
 
     def test_04_ticket_screen(self):
         self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb(check_coa=False)
-        self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'PosResTicketScreenTour', login="admin", step_delay=50)
+        self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'PosResTicketScreenTour', login="admin")
 
     def test_05_tip_screen(self):
         self.pos_config.write({'set_tip_after_payment': True, 'iface_tipproduct': True, 'tip_product_id': self.env.ref('point_of_sale.product_product_tip')})
         self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb(check_coa=False)
-        self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'PosResTipScreenTour', login="admin", step_delay=50)
+        self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'PosResTipScreenTour', login="admin")
 
         order1 = self.env['pos.order'].search([('pos_reference', 'ilike', '%-0001')])
         order2 = self.env['pos.order'].search([('pos_reference', 'ilike', '%-0002')])