diff --git a/tests/src/python/CMakeLists.txt b/tests/src/python/CMakeLists.txt
index bd540691445..010c00f5412 100644
--- a/tests/src/python/CMakeLists.txt
+++ b/tests/src/python/CMakeLists.txt
@@ -33,6 +33,7 @@ ADD_PYTHON_TEST(PyQgsComposerView test_qgscomposerview.py)
 ADD_PYTHON_TEST(PyQgsComposition test_qgscomposition.py)
 ADD_PYTHON_TEST(PyQgsConditionalStyle test_qgsconditionalstyle.py)
 ADD_PYTHON_TEST(PyQgsCoordinateTransform test_qgscoordinatetransform.py)
+ADD_PYTHON_TEST(PyQgsCRSCache test_qgscrscache.py)
 ADD_PYTHON_TEST(PyQgsDateTimeStatisticalSummary test_qgsdatetimestatisticalsummary.py)
 ADD_PYTHON_TEST(PyQgsDelimitedTextProvider test_qgsdelimitedtextprovider.py)
 ADD_PYTHON_TEST(PyQgsDistanceArea test_qgsdistancearea.py)
diff --git a/tests/src/python/test_qgscrscache.py b/tests/src/python/test_qgscrscache.py
new file mode 100644
index 00000000000..10d47bb30c8
--- /dev/null
+++ b/tests/src/python/test_qgscrscache.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+"""QGIS Unit tests for QgsCRSCache.
+
+.. note:: This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+"""
+__author__ = 'Nyall Dawson'
+__date__ = '06/06/2016'
+__copyright__ = 'Copyright 2016, The QGIS Project'
+# This will get replaced with a git SHA1 when you do a git archive
+__revision__ = '$Format:%H$'
+
+import qgis  # NOQA
+
+from qgis.core import (QgsCRSCache,
+                       QgsCoordinateReferenceSystem,
+                       QGis,
+                       QgsUnitTypes
+                       )
+
+from qgis.testing import start_app, unittest
+from qgis.PyQt.QtCore import QLocale
+
+# Convenience instances in case you may need them
+# not used in this test
+
+start_app()
+
+
+class TestQgsCRSCache(unittest.TestCase):
+
+    def testInstance(self):
+        """ test retrieving global instance """
+        self.assertTrue(QgsCRSCache.instance())
+
+    def testcrsByOgcWmsCrs(self):
+        """ test retrieving CRS from cache using Ogc WMS definition """
+
+        crs = QgsCRSCache.instance().crsByOgcWmsCrs('EPSG:4326')
+        self.assertTrue(crs.isValid())
+        self.assertEqual(crs.authid(), 'EPSG:4326')
+        # a second time, so crs is fetched from cache
+        crs = QgsCRSCache.instance().crsByOgcWmsCrs('EPSG:4326')
+        self.assertTrue(crs.isValid())
+        self.assertEqual(crs.authid(), 'EPSG:4326')
+
+        # invalid
+        crs = QgsCRSCache.instance().crsByOgcWmsCrs('i am not a CRS')
+        self.assertFalse(crs.isValid())
+        # a second time, so invalid crs is fetched from cache
+        crs = QgsCRSCache.instance().crsByOgcWmsCrs('i am not a CRS')
+        self.assertFalse(crs.isValid())
+
+    def testcrsByEpsgId(self):
+        """ test retrieving CRS from cache using EPSG id """
+
+        crs = QgsCRSCache.instance().crsByEpsgId(3111)
+        self.assertTrue(crs.isValid())
+        self.assertEqual(crs.authid(), 'EPSG:3111')
+        # a second time, so crs is fetched from cache
+        crs = QgsCRSCache.instance().crsByEpsgId(3111)
+        self.assertTrue(crs.isValid())
+        self.assertEqual(crs.authid(), 'EPSG:3111')
+
+        # invalid
+        crs = QgsCRSCache.instance().crsByEpsgId(-9999)
+        self.assertFalse(crs.isValid())
+        # a second time, so invalid crs is fetched from cache
+        crs = QgsCRSCache.instance().crsByEpsgId(-9999)
+        self.assertFalse(crs.isValid())
+
+    def testcrsByProj4(self):
+        """ test retrieving CRS from cache using proj4 """
+
+        crs = QgsCRSCache.instance().crsByProj4('+proj=utm +zone=55 +south +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs ')
+        self.assertTrue(crs.isValid())
+        self.assertEqual(crs.authid(), 'EPSG:28355')
+        # a second time, so crs is fetched from cache
+        crs = QgsCRSCache.instance().crsByProj4('+proj=utm +zone=55 +south +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs ')
+        self.assertTrue(crs.isValid())
+        self.assertEqual(crs.authid(), 'EPSG:28355')
+
+        # invalid
+        crs = QgsCRSCache.instance().crsByProj4('asdasdasd')
+        self.assertFalse(crs.isValid())
+        # a second time, so invalid crs is fetched from cache
+        crs = QgsCRSCache.instance().crsByProj4('asdasdasd')
+        self.assertFalse(crs.isValid())
+
+if __name__ == '__main__':
+    unittest.main()