diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js
index babb22a5ba1..16e304c14a6 100644
--- a/addons/web/static/tests/views/calendar_tests.js
+++ b/addons/web/static/tests/views/calendar_tests.js
@@ -34,10 +34,8 @@ function _preventScroll(ev) {
 }
 
 QUnit.module('Views', {
-    before: function () {
-        window.addEventListener('scroll', _preventScroll, true);
-    },
     beforeEach: function () {
+        window.addEventListener('scroll', _preventScroll, true);
         session.uid = -1; // TO CHECK
         this.data = {
             event: {
@@ -106,7 +104,7 @@ QUnit.module('Views', {
             },
         };
     },
-    after: function () {
+    afterEach: function () {
         window.removeEventListener('scroll', _preventScroll, true);
     },
 }, function () {