diff --git a/rendering/cases/source-tilewms-gutter0/expected.png b/rendering/cases/source-tilewms-gutter0/expected.png
new file mode 100644
index 0000000000..8a2f9ed635
Binary files /dev/null and b/rendering/cases/source-tilewms-gutter0/expected.png differ
diff --git a/rendering/cases/source-tilewms-gutter0/main.js b/rendering/cases/source-tilewms-gutter0/main.js
new file mode 100644
index 0000000000..101dee5322
--- /dev/null
+++ b/rendering/cases/source-tilewms-gutter0/main.js
@@ -0,0 +1,26 @@
+import Map from '../../../src/ol/Map.js';
+import View from '../../../src/ol/View.js';
+import TileLayer from '../../../src/ol/layer/Tile.js';
+import TileWMS from '../../../src/ol/source/TileWMS.js';
+
+const tileWms = new TileWMS({
+  params: {
+    'LAYERS': 'layer'
+  },
+  gutter: 0,
+  url: '/data/tiles/wms/wms0.png',
+  transition: 0
+});
+
+new Map({
+  pixelRatio: 1,
+  layers: [new TileLayer({source: tileWms})],
+  target: 'map',
+  view: new View({
+    center: [0, 0],
+    zoom: 5
+  })
+});
+
+render();
+
diff --git a/rendering/cases/source-tilewms-gutter20/expected.png b/rendering/cases/source-tilewms-gutter20/expected.png
new file mode 100644
index 0000000000..03b9bcc8d6
Binary files /dev/null and b/rendering/cases/source-tilewms-gutter20/expected.png differ
diff --git a/rendering/cases/source-tilewms-gutter20/main.js b/rendering/cases/source-tilewms-gutter20/main.js
new file mode 100644
index 0000000000..060d2dcff5
--- /dev/null
+++ b/rendering/cases/source-tilewms-gutter20/main.js
@@ -0,0 +1,26 @@
+import Map from '../../../src/ol/Map.js';
+import View from '../../../src/ol/View.js';
+import TileLayer from '../../../src/ol/layer/Tile.js';
+import TileWMS from '../../../src/ol/source/TileWMS.js';
+
+const tileWms = new TileWMS({
+  params: {
+    'LAYERS': 'layer'
+  },
+  gutter: 20,
+  url: '/data/tiles/wms/wms20.png',
+  transition: 0
+});
+
+new Map({
+  pixelRatio: 1,
+  layers: [new TileLayer({source: tileWms})],
+  target: 'map',
+  view: new View({
+    center: [0, 0],
+    zoom: 5
+  })
+});
+
+render();
+
diff --git a/rendering/data/tiles/wms/wms0.png b/rendering/data/tiles/wms/wms0.png
new file mode 100644
index 0000000000..55c3ce686f
Binary files /dev/null and b/rendering/data/tiles/wms/wms0.png differ
diff --git a/rendering/data/tiles/wms/wms20.png b/rendering/data/tiles/wms/wms20.png
new file mode 100644
index 0000000000..34a5a73d2f
Binary files /dev/null and b/rendering/data/tiles/wms/wms20.png differ
diff --git a/test/rendering/ol/source/expected/0_1.canvas.png b/test/rendering/ol/source/expected/0_1.canvas.png
deleted file mode 100644
index 4625d7cffa..0000000000
Binary files a/test/rendering/ol/source/expected/0_1.canvas.png and /dev/null differ
diff --git a/test/rendering/ol/source/expected/0_1.webgl.png b/test/rendering/ol/source/expected/0_1.webgl.png
deleted file mode 100644
index 4625d7cffa..0000000000
Binary files a/test/rendering/ol/source/expected/0_1.webgl.png and /dev/null differ
diff --git a/test/rendering/ol/source/expected/0_2.canvas.png b/test/rendering/ol/source/expected/0_2.canvas.png
deleted file mode 100644
index 3cfbad22af..0000000000
Binary files a/test/rendering/ol/source/expected/0_2.canvas.png and /dev/null differ
diff --git a/test/rendering/ol/source/expected/0_2.webgl.png b/test/rendering/ol/source/expected/0_2.webgl.png
deleted file mode 100644
index 8d19c47348..0000000000
Binary files a/test/rendering/ol/source/expected/0_2.webgl.png and /dev/null differ
diff --git a/test/rendering/ol/source/expected/20_1.canvas.png b/test/rendering/ol/source/expected/20_1.canvas.png
deleted file mode 100644
index a75dd1e926..0000000000
Binary files a/test/rendering/ol/source/expected/20_1.canvas.png and /dev/null differ
diff --git a/test/rendering/ol/source/expected/20_1.webgl.png b/test/rendering/ol/source/expected/20_1.webgl.png
deleted file mode 100644
index caea581e84..0000000000
Binary files a/test/rendering/ol/source/expected/20_1.webgl.png and /dev/null differ
diff --git a/test/rendering/ol/source/expected/20_2.canvas.png b/test/rendering/ol/source/expected/20_2.canvas.png
deleted file mode 100644
index 7db1f7d43f..0000000000
Binary files a/test/rendering/ol/source/expected/20_2.canvas.png and /dev/null differ
diff --git a/test/rendering/ol/source/expected/20_2.webgl.png b/test/rendering/ol/source/expected/20_2.webgl.png
deleted file mode 100644
index 62d46969a4..0000000000
Binary files a/test/rendering/ol/source/expected/20_2.webgl.png and /dev/null differ
diff --git a/test/rendering/ol/source/tilewms.test.js b/test/rendering/ol/source/tilewms.test.js
deleted file mode 100644
index 6b7fc14a81..0000000000
--- a/test/rendering/ol/source/tilewms.test.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import Map from '../../../../src/ol/Map.js';
-import View from '../../../../src/ol/View.js';
-import TileLayer from '../../../../src/ol/layer/Tile.js';
-import TileWMS from '../../../../src/ol/source/TileWMS.js';
-
-describe('ol.rendering.source.TileWMS', function() {
-
-  function tilesLoaded(source, callback) {
-    let loading = 0;
-
-    source.on('tileloadstart', function(event) {
-      loading++;
-    });
-    source.on('tileloadend', function(event) {
-      loading--;
-      if (loading == 0) {
-        callback();
-      }
-    });
-    source.on('tileloaderror', function(event) {
-      expect().fail('Tile failed to load');
-    });
-
-  }
-
-  let map;
-  function createMap(renderer, pixelRatio) {
-    const MapConstructor = Map;
-
-    map = new MapConstructor({
-      target: createMapDiv(200, 200),
-      pixelRatio: pixelRatio,
-      view: new View({
-        center: [0, 0],
-        zoom: 5
-      })
-    });
-  }
-
-  afterEach(function() {
-    if (map) {
-      disposeMap(map);
-    }
-    map = null;
-  });
-
-  function createSource(gutter) {
-    return new TileWMS({
-      params: {
-        'LAYERS': 'layer'
-      },
-      gutter: gutter,
-      url: 'rendering/ol/data/tiles/wms/wms' + gutter + '.png',
-      transition: 0
-    });
-  }
-
-
-  describe('0px gutter, 1 pixel ratio', function() {
-    it('tests the canvas renderer', function(done) {
-      createMap('canvas', 1);
-      const source = createSource(0);
-      tilesLoaded(source, function() {
-        expectResemble(map, 'rendering/ol/source/expected/0_1.canvas.png', IMAGE_TOLERANCE, done);
-      });
-      map.addLayer(new TileLayer({
-        source: source
-      }));
-    });
-  });
-
-  describe('0px gutter, 2 pixel ratio', function() {
-    it('tests the canvas renderer', function(done) {
-      createMap('canvas', 2);
-      const source = createSource(0);
-      tilesLoaded(source, function() {
-        expectResemble(map, 'rendering/ol/source/expected/0_2.canvas.png', IMAGE_TOLERANCE, done);
-      });
-      map.addLayer(new TileLayer({
-        source: source
-      }));
-    });
-  });
-
-
-  describe('20px gutter, 1 pixel ratio', function() {
-    it('tests the canvas renderer', function(done) {
-      createMap('canvas', 1);
-      const source = createSource(20);
-      tilesLoaded(source, function() {
-        expectResemble(map, 'rendering/ol/source/expected/20_1.canvas.png', IMAGE_TOLERANCE, done);
-      });
-      map.addLayer(new TileLayer({
-        source: source
-      }));
-    });
-  });
-
-  describe('20px gutter, 2 pixel ratio', function() {
-    it('tests the canvas renderer', function(done) {
-      createMap('canvas', 2);
-      const source = createSource(20);
-      tilesLoaded(source, function() {
-        expectResemble(map, 'rendering/ol/source/expected/20_2.canvas.png', IMAGE_TOLERANCE, done);
-      });
-      map.addLayer(new TileLayer({
-        source: source
-      }));
-    });
-  });
-
-});