diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 4705fb80af8..14908e56f5e 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -122,7 +122,7 @@ var Tour = {
         if (tour.steps[index-1] &&
             tour.steps[index-1].popover && tour.steps[index-1].popover.next) {
             var step = {
-                _title: "",
+                _title: "close popover and finish",
                 id: index,
                 waitNot: '.popover.tour.fade.in:visible'
             };
@@ -365,7 +365,7 @@ var Tour = {
                 Tour.registerSteps(state.tour);
                 Tour.nextStep();
             } else {
-                if (state.wait > 10) {
+                if (state.wait >= 10) {
                     Tour.error(state.step, "Tour '"+state.id+"' undefined");
                 }
                 Tour.saveState(state.id, state.mode, state.step_id, state.number-1, state.wait+1);
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 7dc160995e4..08fc3be483d 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -247,6 +247,7 @@
                     <t t-call="web.assets_backend"/>
 
                     <script type="text/javascript" id="qunit_config">
+                        localStorage.clear();
                         QUnit.config.testTimeout = 5 * 60 * 1000;
                         QUnit.moduleDone(function(result) {
                             console.log(result.name + " (" + result.passed + "/" + result.total + " passed tests)");