diff --git a/rendering/cases/layer-tile-render-listener/expected.png b/rendering/cases/layer-tile-render-listener/expected.png
new file mode 100644
index 0000000000..e4755778b6
Binary files /dev/null and b/rendering/cases/layer-tile-render-listener/expected.png differ
diff --git a/rendering/cases/layer-tile-render-listener/main.js b/rendering/cases/layer-tile-render-listener/main.js
new file mode 100644
index 0000000000..ad16f713ba
--- /dev/null
+++ b/rendering/cases/layer-tile-render-listener/main.js
@@ -0,0 +1,46 @@
+import Map from '../../../src/ol/Map.js';
+import View from '../../../src/ol/View.js';
+import TileLayer from '../../../src/ol/layer/Tile.js';
+import {transform, fromLonLat} from '../../../src/ol/proj';
+import XYZ from '../../../src/ol/source/XYZ';
+import CircleStyle from '../../../src/ol/style/Circle.js';
+import Fill from '../../../src/ol/style/Fill.js';
+import Stroke from '../../../src/ol/style/Stroke.js';
+import Point from '../../../src/ol/geom/Point.js';
+import {getVectorContext} from '../../../src/ol/render.js';
+
+const center = fromLonLat([8.6, 50.1]);
+
+const layer = new TileLayer({
+  source: new XYZ({
+    url: '/data/tiles/satellite/{z}/{x}/{y}.jpg',
+    transition: 0
+  })
+});
+
+const onRender = function(event) {
+  const context = event.context;
+  context.restore();
+  const vectorContext = getVectorContext(event);
+  vectorContext.setImageStyle(new CircleStyle({
+    radius: 12,
+    fill: new Fill({color: 'yellow'}),
+    stroke: new Stroke({color: 'red', width: 1})
+  }));
+  vectorContext.drawPoint(new Point(
+    transform([13, 37], 'EPSG:4326', 'EPSG:3857')));
+};
+layer.on('postrender', onRender);
+
+const map = new Map({
+  layers: [
+  ],
+  target: 'map',
+  view: new View({
+    center: center,
+    zoom: 3
+  })
+});
+map.addLayer(layer);
+
+render();
diff --git a/test/rendering/ol/layer/expected/render-canvas.png b/test/rendering/ol/layer/expected/render-canvas.png
deleted file mode 100644
index 1f24f74434..0000000000
Binary files a/test/rendering/ol/layer/expected/render-canvas.png and /dev/null differ
diff --git a/test/rendering/ol/layer/tile.test.js b/test/rendering/ol/layer/tile.test.js
deleted file mode 100644
index 266d3a59da..0000000000
--- a/test/rendering/ol/layer/tile.test.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import Map from '../../../../src/ol/Map.js';
-import View from '../../../../src/ol/View.js';
-import Point from '../../../../src/ol/geom/Point.js';
-import TileLayer from '../../../../src/ol/layer/Tile.js';
-import {assign} from '../../../../src/ol/obj.js';
-import {transform} from '../../../../src/ol/proj.js';
-import XYZ from '../../../../src/ol/source/XYZ.js';
-import CircleStyle from '../../../../src/ol/style/Circle.js';
-import Fill from '../../../../src/ol/style/Fill.js';
-import Stroke from '../../../../src/ol/style/Stroke.js';
-
-describe('ol.rendering.layer.Tile', function() {
-
-  let map;
-
-  function createMap(renderer, opt_center, opt_size, opt_pixelRatio, opt_resolutions) {
-    const MapConstructor = Map;
-    const size = opt_size !== undefined ? opt_size : [50, 50];
-
-    map = new MapConstructor({
-      pixelRatio: opt_pixelRatio || 1,
-      target: createMapDiv(size[0], size[1]),
-      view: new View({
-        center: opt_center !== undefined ? opt_center : transform(
-          [-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'),
-        resolutions: opt_resolutions,
-        zoom: 5
-      })
-    });
-  }
-
-  afterEach(function() {
-    if (map) {
-      disposeMap(map);
-    }
-    map = null;
-  });
-
-  function waitForTiles(renderer, sources, layerOptions, onTileLoaded) {
-    const LayerConstructor = TileLayer;
-    let tilesLoading = 0;
-    let tileLoaded = 0;
-
-    const update = function() {
-      if (tilesLoading === tileLoaded) {
-        onTileLoaded();
-      }
-    };
-
-    sources.forEach(function(source, i) {
-      source.on('tileloadstart', function(event) {
-        tilesLoading++;
-      });
-      source.on('tileloadend', function(event) {
-        tileLoaded++;
-        update();
-      });
-      source.on('tileloaderror', function(event) {
-        expect().fail('Tile failed to load');
-      });
-
-      const options = {
-        source: source
-      };
-      assign(options, layerOptions[i] || layerOptions);
-      map.addLayer(new LayerConstructor(options));
-    });
-  }
-
-  describe('tile layer with render listener', function() {
-    let source, onAddLayer;
-
-    beforeEach(function() {
-      source = new XYZ({
-        url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png',
-        transition: 0
-      });
-      onAddLayer = function(evt) {
-        evt.element.on('render', function(e) {
-          e.vectorContext.setImageStyle(new CircleStyle({
-            radius: 5,
-            fill: new Fill({color: 'yellow'}),
-            stroke: new Stroke({color: 'red', width: 1})
-          }));
-          e.vectorContext.drawPoint(new Point(
-            transform([-123, 38], 'EPSG:4326', 'EPSG:3857')));
-        });
-      };
-    });
-
-    it('works with the canvas renderer', function(done) {
-      createMap('canvas', undefined, [100, 100]);
-      map.getLayers().on('add', onAddLayer);
-      waitForTiles('canvas', [source], {}, function() {
-        expectResemble(map, 'rendering/ol/layer/expected/render-canvas.png',
-          IMAGE_TOLERANCE, done);
-      });
-    });
-  });
-});