diff --git a/test/ol.html b/test/ol.html
index e1ffda81e8..f3c74e6edf 100644
--- a/test/ol.html
+++ b/test/ol.html
@@ -89,6 +89,7 @@
   <script type="text/javascript" src="spec/ol/projection.test.js"></script>
   <script type="text/javascript" src="spec/ol/tileurlfunction.test.js"></script>
   <script type="text/javascript" src="spec/ol/interaction/resolutionconstraint.test.js"></script>
+  <script type="text/javascript" src="spec/ol/layer/xyz.test.js"></script>
 
   <script type="text/javascript">
     (function() {
diff --git a/test/spec/ol/layer/xyz.test.js b/test/spec/ol/layer/xyz.test.js
new file mode 100644
index 0000000000..0dd3eb0e25
--- /dev/null
+++ b/test/spec/ol/layer/xyz.test.js
@@ -0,0 +1,127 @@
+goog.require('ol.Coordinate');
+goog.require('ol.TileCoord');
+goog.require('ol.TileUrlFunction');
+goog.require('ol.tilestore.XYZ');
+
+describe('ol.tilestore.XYZ', function() {
+
+  describe('getTileCoordUrl', function() {
+
+    var xyzTileStore, tileGrid;
+
+    beforeEach(function() {
+      xyzTileStore = new ol.tilestore.XYZ(
+          6, ol.TileUrlFunction.createFromTemplate('{z}/{x}/{y}'));
+      tileGrid = xyzTileStore.getTileGrid();
+    });
+
+    it('return the expected URL', function() {
+      var coordinate = new ol.Coordinate(829330.2064098881, 5933916.615134273);
+      var tileUrl;
+
+      tileUrl = xyzTileStore.getTileCoordUrl(
+          tileGrid.getTileCoordForCoordAndZ(coordinate, 0));
+      expect(tileUrl).toEqual('0/0/0');
+
+      tileUrl = xyzTileStore.getTileCoordUrl(
+          tileGrid.getTileCoordForCoordAndZ(coordinate, 1));
+      expect(tileUrl).toEqual('1/1/0');
+
+      tileUrl = xyzTileStore.getTileCoordUrl(
+          tileGrid.getTileCoordForCoordAndZ(coordinate, 2));
+      expect(tileUrl).toEqual('2/2/1');
+
+      tileUrl = xyzTileStore.getTileCoordUrl(
+          tileGrid.getTileCoordForCoordAndZ(coordinate, 3));
+      expect(tileUrl).toEqual('3/4/2');
+
+      tileUrl = xyzTileStore.getTileCoordUrl(
+          tileGrid.getTileCoordForCoordAndZ(coordinate, 4));
+      expect(tileUrl).toEqual('4/8/5');
+
+      tileUrl = xyzTileStore.getTileCoordUrl(
+          tileGrid.getTileCoordForCoordAndZ(coordinate, 5));
+      expect(tileUrl).toEqual('5/16/11');
+
+      tileUrl = xyzTileStore.getTileCoordUrl(
+          tileGrid.getTileCoordForCoordAndZ(coordinate, 6));
+      expect(tileUrl).toEqual('6/33/22');
+    });
+
+    describe('wrap x', function() {
+      it('returns the expected URL', function() {
+        tileUrl = xyzTileStore.getTileCoordUrl(new ol.TileCoord(6, -31, -23));
+        expect(tileUrl).toEqual('6/33/22');
+
+        tileUrl = xyzTileStore.getTileCoordUrl(new ol.TileCoord(6, 33, -23));
+        expect(tileUrl).toEqual('6/33/22');
+
+        tileUrl = xyzTileStore.getTileCoordUrl(new ol.TileCoord(6, 97, -23));
+        expect(tileUrl).toEqual('6/33/22');
+      });
+    });
+
+    describe('crop y', function() {
+      it('returns the expected URL', function() {
+        tileUrl = xyzTileStore.getTileCoordUrl(new ol.TileCoord(6, 33, -87));
+        expect(tileUrl).toBeUndefined();
+
+        tileUrl = xyzTileStore.getTileCoordUrl(new ol.TileCoord(6, 33, -23));
+        expect(tileUrl).toEqual('6/33/22');
+
+        tileUrl = xyzTileStore.getTileCoordUrl(new ol.TileCoord(6, 33, 41));
+        expect(tileUrl).toBeUndefined();
+      });
+    });
+  });
+
+  describe('forEachTileCoordParentTileRange', function() {
+    it('iterates as expected', function() {
+      var xyzTileGrid = new ol.tilegrid.XYZ(6);
+
+      var tileCoord = new ol.TileCoord(5, 11, 21);
+      var zs = [], tileRanges = [];
+      xyzTileGrid.forEachTileCoordParentTileRange(
+          tileCoord,
+          function(z, tileRange) {
+            zs.push(z);
+            tileRanges.push(tileRange);
+            return false;
+          });
+
+      expect(zs.length).toEqual(5);
+      expect(tileRanges.length).toEqual(5);
+
+      expect(zs[0]).toEqual(4);
+      expect(tileRanges[0].minX).toEqual(5);
+      expect(tileRanges[0].minY).toEqual(10);
+      expect(tileRanges[0].maxX).toEqual(5);
+      expect(tileRanges[0].maxY).toEqual(10);
+
+      expect(zs[1]).toEqual(3);
+      expect(tileRanges[1].minX).toEqual(2);
+      expect(tileRanges[1].minY).toEqual(5);
+      expect(tileRanges[1].maxX).toEqual(2);
+      expect(tileRanges[1].maxY).toEqual(5);
+
+      expect(zs[2]).toEqual(2);
+      expect(tileRanges[2].minX).toEqual(1);
+      expect(tileRanges[2].minY).toEqual(2);
+      expect(tileRanges[2].maxX).toEqual(1);
+      expect(tileRanges[2].maxY).toEqual(2);
+
+      expect(zs[3]).toEqual(1);
+      expect(tileRanges[3].minX).toEqual(0);
+      expect(tileRanges[3].minY).toEqual(1);
+      expect(tileRanges[3].maxX).toEqual(0);
+      expect(tileRanges[3].maxY).toEqual(1);
+
+      expect(zs[4]).toEqual(0);
+      expect(tileRanges[4].minX).toEqual(0);
+      expect(tileRanges[4].minY).toEqual(0);
+      expect(tileRanges[4].maxX).toEqual(0);
+      expect(tileRanges[4].maxY).toEqual(0);
+    });
+  });
+
+});