diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index eed431e071b..1a4a987739f 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -306,7 +306,7 @@ var T = website.Tour = {
             window.location.hash = "";
             T.saveState(state.id, state.mode, state.step_id);
         }
-        if (!state.id) {
+        if (!state.id || !T.tours[state.id]) {
             return;
         }
         state.tour = T.tours[state.id];
@@ -349,20 +349,21 @@ var T = website.Tour = {
         clearTimeout(T.testtimer);
         T.closePopover();
     },
+    testRunning: 0,
     running: function () {
-        var state = T.getState();
-        if (state) {
-            T.registerSteps(state.tour);
+        setTimeout(function () {
             if ($.ajaxBusy) {
                 $(document).ajaxStop(function() {
-                    setTimeout(function () {
-                        T.nextStep();
-                    },0);
+                    var state = T.getState();
+                    T.registerSteps(state.tour);
+                    T.nextStep();
                 });
             } else {
+                var state = T.getState();
+                T.registerSteps(state.tour);
                 T.nextStep();
             }
-        }
+        },0);
     },
     check: function (step) {
         return (step &&
diff --git a/addons/website_event_sale/tests/__init__.py b/addons/website_event_sale/tests/__init__.py
index c9d4e3399ba..bf8ba6321ad 100644
--- a/addons/website_event_sale/tests/__init__.py
+++ b/addons/website_event_sale/tests/__init__.py
@@ -1 +1 @@
-#import test_ui
+import test_ui
diff --git a/addons/website_event_sale/tests/test_ui.py b/addons/website_event_sale/tests/test_ui.py
index 3e26fba5cf4..fccbabb9d18 100644
--- a/addons/website_event_sale/tests/test_ui.py
+++ b/addons/website_event_sale/tests/test_ui.py
@@ -1,8 +1,10 @@
+import os
+
 import openerp.tests
 
 inject = [
-    "./../../../website/static/src/js/website.tour.test.js",
-    "./../../../website_event_sale/static/src/js/website.tour.event_sale.js",
+    ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../../website/static/src/js/website.tour.js')),
+    ("openerp.website.Tour.tours.event_buy_tickets", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.event_sale.js")),
 ]
 
 @openerp.tests.common.at_install(False)