diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index bb7e1e0f9a5..edf9a352459 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -43,7 +43,7 @@ class WebsiteUiTest(unittest.TestCase):
 
 class WebsiteUiSuite(unittest.TestSuite):
     # timeout is in seconds
-    def __init__(self, testfile, timeout=10):
+    def __init__(self, testfile, timeout=10.0):
         self.testfile = testfile
         self.timeout = timeout
         self._test = None
@@ -135,7 +135,7 @@ class WebsiteUiSuite(unittest.TestSuite):
                 message = args.get('message', "")
                 result.addFailure(self._test, message)
             else:
-                result.addError(self._test, 'Unexpected message: "%s"' % line)
+                result.addError(self._test, 'Unexpected JSON: "%s"' % line)
         except ValueError:
              result.addError(self._test, 'Unexpected message: "%s"' % line)
 
diff --git a/addons/website/tests/ui_suite/dom_test.js b/addons/website/tests/ui_suite/dom_test.js
index ee60d827ce0..f1daa87dbb2 100644
--- a/addons/website/tests/ui_suite/dom_test.js
+++ b/addons/website/tests/ui_suite/dom_test.js
@@ -8,7 +8,7 @@ page.onError = function(message, trace) {
 };
 
 function waitFor(ready, timeout) {
-    var timeOutMillis = timeout ? timeout*1000 : 10000;
+    var timeOutMillis = timeout ? Math.round(timeout*1000) : 10000;
     var start = new Date().getTime();
     var condition = ready();
     var interval = setInterval(function() {