diff --git a/addons/board/static/tests/dashboard_tests.js b/addons/board/static/tests/dashboard_tests.js
index 27d685ff46e..d884c33b991 100644
--- a/addons/board/static/tests/dashboard_tests.js
+++ b/addons/board/static/tests/dashboard_tests.js
@@ -123,9 +123,6 @@ QUnit.test('basic functionality, with one sub action', function (assert) {
             if (route === '/web/dataset/search_read') {
                 assert.deepEqual(args.domain, [['foo', '!=', 'False']], "the domain should be passed");
             }
-            if (route === '/board/static/src/img/layout_1-1-1.png') {
-                return $.when();
-            }
             if (route === '/web/view/add_custom') {
                 assert.step('add custom');
                 return $.when(true);
@@ -207,9 +204,6 @@ QUnit.test('can sort a sub list', function (assert) {
                 '</board>' +
             '</form>',
         mockRPC: function (route) {
-            if (route === '/board/static/src/img/layout_1-1-1.png') {
-                return $.when();
-            }
             if (route === '/web/action/load') {
                 return $.when({
                     res_model: 'partner',
@@ -249,9 +243,6 @@ QUnit.test('can open a record', function (assert) {
                 '</board>' +
             '</form>',
         mockRPC: function (route) {
-            if (route === '/board/static/src/img/layout_1-1-1.png') {
-                return $.when();
-            }
             if (route === '/web/action/load') {
                 return $.when({
                     res_model: 'partner',
@@ -295,9 +286,6 @@ QUnit.test('can drag and drop a view', function (assert) {
                 '</board>' +
             '</form>',
         mockRPC: function (route) {
-            if (route === '/board/static/src/img/layout_1-1-1.png') {
-                return $.when();
-            }
             if (route === '/web/action/load') {
                 return $.when({
                     res_model: 'partner',
@@ -345,9 +333,6 @@ QUnit.test('twice the same action in a dashboard', function (assert) {
                 '</board>' +
             '</form>',
         mockRPC: function (route) {
-            if (route === '/board/static/src/img/layout_1-1-1.png') {
-                return $.when();
-            }
             if (route === '/web/action/load') {
                 return $.when({
                     res_model: 'partner',
diff --git a/addons/google_calendar/static/tests/google_calendar_tests.js b/addons/google_calendar/static/tests/google_calendar_tests.js
index 08176dde839..6edd786afd0 100644
--- a/addons/google_calendar/static/tests/google_calendar_tests.js
+++ b/addons/google_calendar/static/tests/google_calendar_tests.js
@@ -93,8 +93,6 @@ QUnit.module('Google Calendar', {
                         {id: 7, user_id: 4, partner_id: 4, name: "event from google calendar", start: "2016-12-28 15:55:05", stop: "2016-12-29 18:55:05", allday: false, partner_ids: [], type: 2}
                     );
                     return $.when({status: 'need_refresh'});
-                } else if (route === '/google_calendar/static/src/img/calendar_32.png') {
-                    return $.when();
                 } else if (route === '/web/dataset/call_kw/calendar.event/search_read') {
                     assert.step(route);
                 }
diff --git a/addons/web/static/tests/helpers/mock_server.js b/addons/web/static/tests/helpers/mock_server.js
index 3f97df1d4bf..8e72fe4ede4 100644
--- a/addons/web/static/tests/helpers/mock_server.js
+++ b/addons/web/static/tests/helpers/mock_server.js
@@ -846,7 +846,7 @@ var MockServer = Class.extend({
             case '/web/dataset/search_read':
                 return $.when(this._mockSearchReadController(args));
         }
-        if (route.indexOf('/web/image/') === 0) {
+        if (route.indexOf('/web/image') >= 0 || _.contains(['.png', '.jpg'], route.substr(route.length - 4))) {
             return $.when();
         }
         switch (args.method) {