diff --git a/tests/src/python/test_provider_tabfile.py b/tests/src/python/test_provider_tabfile.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+"""QGIS Unit tests for the OGR/MapInfo tab provider.
+
+.. 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__ = '2016-01-28'
+__copyright__ = 'Copyright 2016, The QGIS Project'
+# This will get replaced with a git SHA1 when you do a git archive
+__revision__ = '$Format:%H$'
+
+import os
+import tempfile
+import shutil
+import glob
+
+from qgis.core import QgsVectorLayer, QgsFeatureRequest, QgsFeature, QgsProviderRegistry
+from PyQt4.QtCore import QSettings, QDate, QTime, QDateTime, QVariant
+from utilities import (unitTestDataPath,
+                       getQgisTestApp,
+                       unittest,
+                       TestCase
+                       )
+
+QGISAPP, CANVAS, IFACE, PARENT = getQgisTestApp()
+TEST_DATA_DIR = unitTestDataPath()
+
+# Note - doesn't implement ProviderTestCase as OGR provider is tested by the shapefile provider test
+
+
+class TestPyQgsTabfileProvider(TestCase):
+
+    def testDateTimeFormats(self):
+        # check that date and time formats are correctly interpreted
+        basetestfile = os.path.join(TEST_DATA_DIR, 'tab_file.tab')
+        vl = QgsVectorLayer(u'{}|layerid=0'.format(basetestfile), u'test', u'ogr')
+
+        fields = vl.dataProvider().fields()
+        self.assertEqual(fields.at(fields.indexFromName('date')).type(), QVariant.Date)
+        self.assertEqual(fields.at(fields.indexFromName('time')).type(), QVariant.Time)
+        self.assertEqual(fields.at(fields.indexFromName('date_time')).type(), QVariant.DateTime)
+
+        f = vl.getFeatures(QgsFeatureRequest()).next()
+
+        date_idx = vl.fieldNameIndex('date')
+        assert isinstance(f.attributes()[date_idx], QDate)
+        time_idx = vl.fieldNameIndex('time')
+        assert isinstance(f.attributes()[time_idx], QTime)
+        datetime_idx = vl.fieldNameIndex('date_time')
+        assert isinstance(f.attributes()[datetime_idx], QDateTime)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/src/python/test_qgsvectorfilewriter.py b/tests/src/python/test_qgsvectorfilewriter.py
@@ -17,9 +17,13 @@
 from qgis.core import (QgsVectorLayer,
                        QgsFeature,
                        QgsGeometry,
-                       QgsPoint
+                       QgsPoint,
+                       QgsCoordinateReferenceSystem,
+                       QgsVectorFileWriter,
+                       QgsFeatureRequest
                        )
-
+from PyQt4.QtCore import QDate, QTime, QDateTime, QVariant, QDir
+import os
 from utilities import (getQgisTestApp,
                        TestCase,
                        unittest,
@@ -53,5 +57,113 @@ def testWrite(self):
 
         writeShape(self.mMemoryLayer, 'writetest.shp')
 
+    def testDateTimeWriteShapefile(self):
+        """Check writing date and time fields to an ESRI shapefile."""
+        ml = QgsVectorLayer(
+            ('Point?crs=epsg:4326&field=id:int&'
+             'field=date_f:date&field=time_f:time&field=dt_f:datetime'),
+            'test',
+            'memory')
+
+        assert ml is not None, 'Provider not initialised'
+        assert ml.isValid(), 'Source layer not valid'
+        provider = ml.dataProvider()
+        assert provider is not None
+
+        ft = QgsFeature()
+        ft.setGeometry(QgsGeometry.fromPoint(QgsPoint(10, 10)))
+        ft.setAttributes([1, QDate(2014, 0o3, 0o5), QTime(13, 45, 22), QDateTime(QDate(2014, 0o3, 0o5), QTime(13, 45, 22))])
+        res, features = provider.addFeatures([ft])
+        assert res
+        assert len(features) > 0
+
+        dest_file_name = os.path.join(str(QDir.tempPath()), 'datetime.shp')
+        print(dest_file_name)
+        crs = QgsCoordinateReferenceSystem()
+        crs.createFromId(4326, QgsCoordinateReferenceSystem.EpsgCrsId)
+        write_result = QgsVectorFileWriter.writeAsVectorFormat(
+            ml,
+            dest_file_name,
+            'utf-8',
+            crs,
+            'ESRI Shapefile')
+        self.assertEqual(write_result, QgsVectorFileWriter.NoError)
+
+        # Open result and check
+        created_layer = QgsVectorLayer(u'{}|layerid=0'.format(dest_file_name), u'test', u'ogr')
+
+        fields = created_layer.dataProvider().fields()
+        self.assertEqual(fields.at(fields.indexFromName('date_f')).type(), QVariant.Date)
+        #shapefiles do not support time types, result should be string
+        self.assertEqual(fields.at(fields.indexFromName('time_f')).type(), QVariant.String)
+        #shapefiles do not support datetime types, result should be date
+        self.assertEqual(fields.at(fields.indexFromName('dt_f')).type(), QVariant.Date)
+
+        f = created_layer.getFeatures(QgsFeatureRequest()).next()
+
+        date_idx = created_layer.fieldNameIndex('date_f')
+        assert isinstance(f.attributes()[date_idx], QDate)
+        self.assertEqual(f.attributes()[date_idx], QDate(2014, 0o3, 0o5))
+        time_idx = created_layer.fieldNameIndex('time_f')
+        #shapefiles do not support time types
+        assert isinstance(f.attributes()[time_idx], basestring)
+        self.assertEqual(f.attributes()[time_idx], '13:45:22')
+        #shapefiles do not support datetime types
+        datetime_idx = created_layer.fieldNameIndex('dt_f')
+        assert isinstance(f.attributes()[datetime_idx], QDate)
+        self.assertEqual(f.attributes()[datetime_idx], QDate(2014, 0o3, 0o5))
+
+    def testDateTimeWriteTabfile(self):
+        """Check writing date and time fields to an MapInfo tabfile."""
+        ml = QgsVectorLayer(
+            ('Point?crs=epsg:4326&field=id:int&'
+             'field=date_f:date&field=time_f:time&field=dt_f:datetime'),
+            'test',
+            'memory')
+
+        assert ml is not None, 'Provider not initialised'
+        assert ml.isValid(), 'Source layer not valid'
+        provider = ml.dataProvider()
+        assert provider is not None
+
+        ft = QgsFeature()
+        ft.setGeometry(QgsGeometry.fromPoint(QgsPoint(10, 10)))
+        ft.setAttributes([1, QDate(2014, 0o3, 0o5), QTime(13, 45, 22), QDateTime(QDate(2014, 0o3, 0o5), QTime(13, 45, 22))])
+        res, features = provider.addFeatures([ft])
+        assert res
+        assert len(features) > 0
+
+        dest_file_name = os.path.join(str(QDir.tempPath()), 'datetime.tab')
+        print(dest_file_name)
+        crs = QgsCoordinateReferenceSystem()
+        crs.createFromId(4326, QgsCoordinateReferenceSystem.EpsgCrsId)
+        write_result = QgsVectorFileWriter.writeAsVectorFormat(
+            ml,
+            dest_file_name,
+            'utf-8',
+            crs,
+            'MapInfo File')
+        self.assertEqual(write_result, QgsVectorFileWriter.NoError)
+
+        # Open result and check
+        created_layer = QgsVectorLayer(u'{}|layerid=0'.format(dest_file_name), u'test', u'ogr')
+
+        fields = created_layer.dataProvider().fields()
+        self.assertEqual(fields.at(fields.indexFromName('date_f')).type(), QVariant.Date)
+        self.assertEqual(fields.at(fields.indexFromName('time_f')).type(), QVariant.Time)
+        self.assertEqual(fields.at(fields.indexFromName('dt_f')).type(), QVariant.DateTime)
+
+        f = created_layer.getFeatures(QgsFeatureRequest()).next()
+
+        date_idx = created_layer.fieldNameIndex('date_f')
+        assert isinstance(f.attributes()[date_idx], QDate)
+        self.assertEqual(f.attributes()[date_idx], QDate(2014, 0o3, 0o5))
+        time_idx = created_layer.fieldNameIndex('time_f')
+        assert isinstance(f.attributes()[time_idx], QTime)
+        self.assertEqual(f.attributes()[time_idx], QTime(13, 45, 22))
+        datetime_idx = created_layer.fieldNameIndex('dt_f')
+        assert isinstance(f.attributes()[datetime_idx], QDateTime)
+        self.assertEqual(f.attributes()[datetime_idx], QDateTime(QDate(2014, 0o3, 0o5), QTime(13, 45, 22)))
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/testdata/provider/testdata_pg.sql b/tests/testdata/provider/testdata_pg.sql
@@ -73,6 +73,15 @@ ALTER TABLE ONLY qgis_test."someData"
 -- PostgreSQL database dump complete
 --
 
+CREATE TABLE qgis_test.date_times(
+       id int,
+       date_field date,
+       time_field time,
+       datetime_field timestamp without time zone
+);
+
+INSERT INTO qgis_test.date_times values (1, '2004-03-04'::date, '13:41:52'::time, '2004-03-04 13:41:52'::timestamp without time zone );
+
 CREATE TABLE qgis_test.p2d(
        id int,
        geom Geometry(Polygon,4326)

diff --git a/tests/testdata/tab_file.dat b/tests/testdata/tab_file.dat
diff --git a/tests/testdata/tab_file.id b/tests/testdata/tab_file.id
diff --git a/tests/testdata/tab_file.map b/tests/testdata/tab_file.map
diff --git a/tests/testdata/tab_file.tab b/tests/testdata/tab_file.tab
@@ -0,0 +1,15 @@
+!table
+!version 900
+!charset WindowsLatin1
+
+Definition Table
+  Type NATIVE Charset "WindowsLatin1"
+  Fields 3
+    date Date ;
+    date_time DateTime ;
+    time Time ;
+begin_metadata
+"\IsReadOnly" = "FALSE"
+"\MapInfo" = ""
+"\MapInfo\TableID" = "bff4e165-c593-457c-a460-6c425cc13dc7"
+end_metadata