diff --git a/addons/website/static/src/js/website.tour.test.admin.js b/addons/website/static/src/js/website.tour.test.admin.js
index 81078185a35..787f05beb23 100644
--- a/addons/website/static/src/js/website.tour.test.admin.js
+++ b/addons/website/static/src/js/website.tour.test.admin.js
@@ -17,13 +17,13 @@
                 {
                     title:     "insert login",
                     element:   '.oe_login_form input[name="login"]',
-                    sampleText: typeof user !== "undefined" ? user : "admin",
+                    sampleText: "admin",
                 },
                 {
                     title:     "insert password",
                     waitFor:   '.oe_login_form input[name="login"][value!=""]',
                     element:   '.oe_login_form input[name="password"]',
-                    sampleText: typeof password !== "undefined" ? password : "admin",
+                    sampleText: "admin",
                 },
                 {
                     title:     "select 2 Standard tickets",
diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index d6f9b67fec2..eafe791c204 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -88,7 +88,7 @@ class WebsiteUiSuite(unittest.TestSuite):
         self._options['db'] = tools.config.get('db_name', '')
         if 'user' not in self._options:
             self._options['user'] = 'admin'
-            self._options['password'] = tools.config.get('admin_passwd', 'admin')
+            self._options['password'] = 'admin'
 
         phantom = subprocess.Popen([
             'phantomjs',
diff --git a/addons/website/tests/ui_suite/login_test.js b/addons/website/tests/ui_suite/login_test.js
index f4413d7afc2..3ac403e586d 100644
--- a/addons/website/tests/ui_suite/login_test.js
+++ b/addons/website/tests/ui_suite/login_test.js
@@ -1,12 +1,7 @@
 var testRunner = require('./ui_test_runner.js');
 
-testRunner.run(
-        function onload (page, timeout, options) {
-            page.evaluate(function (user, password) {
-                window.password = password;
-                window.user = user;
-            }, options.user, options.password);
-        },
-        [   "./../../../website/static/src/js/website.tour.test.js",
+testRunner.run_test('login_edit', {
+        "inject": [
+            "./../../../website/static/src/js/website.tour.test.js",
             "./../../../website/static/src/js/website.tour.test.admin.js"]
-    );
\ No newline at end of file
+    });
\ No newline at end of file