diff --git a/tests/data/shp/points/ogr_zfield.dbf b/tests/data/shp/points/ogr_zfield.dbf
new file mode 100644
index 000000000..b1d47b23a
Binary files /dev/null and b/tests/data/shp/points/ogr_zfield.dbf differ
diff --git a/tests/data/shp/points/ogr_zfield.prj b/tests/data/shp/points/ogr_zfield.prj
new file mode 100644
index 000000000..a30c00a55
--- /dev/null
+++ b/tests/data/shp/points/ogr_zfield.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
diff --git a/tests/data/shp/points/ogr_zfield.shp b/tests/data/shp/points/ogr_zfield.shp
new file mode 100644
index 000000000..6735df41b
Binary files /dev/null and b/tests/data/shp/points/ogr_zfield.shp differ
diff --git a/tests/data/shp/points/ogr_zfield.shx b/tests/data/shp/points/ogr_zfield.shx
new file mode 100644
index 000000000..e3b45769c
Binary files /dev/null and b/tests/data/shp/points/ogr_zfield.shx differ
diff --git a/tests/data/shp/points/poi.dbf b/tests/data/shp/points/poi.dbf
new file mode 100644
index 000000000..797d92d5e
Binary files /dev/null and b/tests/data/shp/points/poi.dbf differ
diff --git a/tests/data/shp/points/poi.prj b/tests/data/shp/points/poi.prj
new file mode 100644
index 000000000..91f1f56b1
--- /dev/null
+++ b/tests/data/shp/points/poi.prj
@@ -0,0 +1 @@
+PROJCS["NAD_1983_HARN_StatePlane_North_Carolina_FIPS_3200_Feet",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",2000000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-79.0],PARAMETER["Standard_Parallel_1",34.33333333333334],PARAMETER["Standard_Parallel_2",36.16666666666666],PARAMETER["Latitude_Of_Origin",33.75],UNIT["Foot_US",0.3048006096012192]]
\ No newline at end of file
diff --git a/tests/data/shp/points/poi.shp b/tests/data/shp/points/poi.shp
new file mode 100644
index 000000000..de2ad3431
Binary files /dev/null and b/tests/data/shp/points/poi.shp differ
diff --git a/tests/data/shp/points/poi.shx b/tests/data/shp/points/poi.shx
new file mode 100644
index 000000000..092e61907
Binary files /dev/null and b/tests/data/shp/points/poi.shx differ
diff --git a/tests/data/shp/points/poi.xml b/tests/data/shp/points/poi.xml
new file mode 100644
index 000000000..f4f2b0b7c
--- /dev/null
+++ b/tests/data/shp/points/poi.xml
@@ -0,0 +1 @@
+<metadata xml:lang="en"><Esri><CreaDate>20120921</CreaDate><CreaTime>16214000</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>FALSE</SyncOnce><DataProperties><itemProps><itemName Sync="TRUE">poi</itemName><imsContentType Sync="TRUE">002</imsContentType><itemSize Sync="TRUE">0.000</itemSize><itemLocation><linkage Sync="TRUE">file://\\ba-projectman\drawings\GIS\gis_data\shapefiles\TileMill\poi.shp</linkage><protocol Sync="TRUE">Local Area Network</protocol></itemLocation></itemProps><coordRef><type Sync="TRUE">Projected</type><geogcsn Sync="TRUE">GCS_North_American_1983_HARN</geogcsn><csUnits Sync="TRUE">Linear Unit: Foot_US (0.304801)</csUnits><projcsn Sync="TRUE">NAD_1983_HARN_StatePlane_North_Carolina_FIPS_3200_Feet</projcsn><peXml Sync="TRUE">&lt;ProjectedCoordinateSystem xsi:type='typens:ProjectedCoordinateSystem' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:typens='http://www.esri.com/schemas/ArcGIS/10.1'&gt;&lt;WKT&gt;PROJCS[&amp;quot;NAD_1983_HARN_StatePlane_North_Carolina_FIPS_3200_Feet&amp;quot;,GEOGCS[&amp;quot;GCS_North_American_1983_HARN&amp;quot;,DATUM[&amp;quot;D_North_American_1983_HARN&amp;quot;,SPHEROID[&amp;quot;GRS_1980&amp;quot;,6378137.0,298.257222101]],PRIMEM[&amp;quot;Greenwich&amp;quot;,0.0],UNIT[&amp;quot;Degree&amp;quot;,0.0174532925199433]],PROJECTION[&amp;quot;Lambert_Conformal_Conic&amp;quot;],PARAMETER[&amp;quot;False_Easting&amp;quot;,2000000.0],PARAMETER[&amp;quot;False_Northing&amp;quot;,0.0],PARAMETER[&amp;quot;Central_Meridian&amp;quot;,-79.0],PARAMETER[&amp;quot;Standard_Parallel_1&amp;quot;,34.33333333333334],PARAMETER[&amp;quot;Standard_Parallel_2&amp;quot;,36.16666666666666],PARAMETER[&amp;quot;Latitude_Of_Origin&amp;quot;,33.75],UNIT[&amp;quot;Foot_US&amp;quot;,0.3048006096012192],AUTHORITY[&amp;quot;EPSG&amp;quot;,3404]]&lt;/WKT&gt;&lt;XOrigin&gt;-121841900&lt;/XOrigin&gt;&lt;YOrigin&gt;-93659000&lt;/YOrigin&gt;&lt;XYScale&gt;36365718.124241434&lt;/XYScale&gt;&lt;ZOrigin&gt;-100000&lt;/ZOrigin&gt;&lt;ZScale&gt;10000&lt;/ZScale&gt;&lt;MOrigin&gt;-100000&lt;/MOrigin&gt;&lt;MScale&gt;10000&lt;/MScale&gt;&lt;XYTolerance&gt;0.0032808333333333331&lt;/XYTolerance&gt;&lt;ZTolerance&gt;0.001&lt;/ZTolerance&gt;&lt;MTolerance&gt;0.001&lt;/MTolerance&gt;&lt;HighPrecision&gt;true&lt;/HighPrecision&gt;&lt;WKID&gt;3359&lt;/WKID&gt;&lt;LatestWKID&gt;3404&lt;/LatestWKID&gt;&lt;/ProjectedCoordinateSystem&gt;</peXml></coordRef><lineage><Process ToolSource="c:\program files (x86)\arcgis\desktop10.1\ArcToolbox\Toolboxes\Conversion Tools.tbx\FeatureClassToFeatureClass" Date="20121204" Time="105924">FeatureClassToFeatureClass Z:\GIS\gis_data\geodatabase\working\UNCW_GIS.gdb\land_status\main_campus_interest_point Z:\GIS\gis_data\shapefiles\TileMill poi.shp # "interst_id "PKInterstID" true true true 20 Text 0 0 ,First,#,Z:\GIS\gis_data\geodatabase\working\UNCW_GIS.gdb\land_status\main_campus_interest_point,interst_id,-1,-1;state_d "StateDOM" true true false 16 Text 0 0 ,First,#,Z:\GIS\gis_data\geodatabase\working\UNCW_GIS.gdb\land_status\main_campus_interest_point,state_d,-1,-1;cnty_name "CntyName" true true false 50 Text 0 0 ,First,#,Z:\GIS\gis_data\geodatabase\working\UNCW_GIS.gdb\land_status\main_campus_interest_point,cnty_name,-1,-1;latitude "Latitude" true true false 8 Double 0 0 ,First,#,Z:\GIS\gis_data\geodatabase\working\UNCW_GIS.gdb\land_status\main_campus_interest_point,latitude,-1,-1;longitude "Longitude" true true false 8 Double 0 0 ,First,#,Z:\GIS\gis_data\geodatabase\working\UNCW_GIS.gdb\land_status\main_campus_interest_point,longitude,-1,-1;Name "Name" true true false 50 Text 0 0 ,First,#,Z:\GIS\gis_data\geodatabase\working\UNCW_GIS.gdb\land_status\main_campus_interest_point,Name,-1,-1;Website "Website" true true false 100 Text 0 0 ,First,#,Z:\GIS\gis_data\geodatabase\working\UNCW_GIS.gdb\land_status\main_campus_interest_point,Website,-1,-1" #</Process></lineage></DataProperties><SyncDate>20121204</SyncDate><SyncTime>10592300</SyncTime><ModDate>20121204</ModDate><ModTime>10592300</ModTime></Esri><dataIdInfo><envirDesc Sync="TRUE">Microsoft Windows 7 Version 6.1 (Build 7600) ; Esri ArcGIS 10.1.1.3143</envirDesc><dataLang><languageCode value="eng" Sync="TRUE"></languageCode><countryCode value="USA" Sync="TRUE"></countryCode></dataLang><idCitation><resTitle Sync="TRUE">poi</resTitle><presForm><PresFormCd value="005" Sync="TRUE"></PresFormCd></presForm></idCitation><spatRpType><SpatRepTypCd value="001" Sync="TRUE"></SpatRepTypCd></spatRpType></dataIdInfo><mdLang><languageCode value="eng" Sync="TRUE"></languageCode><countryCode value="USA" Sync="TRUE"></countryCode></mdLang><distInfo><distFormat><formatName Sync="TRUE">Shapefile</formatName></distFormat><distTranOps><transSize Sync="TRUE">0.000</transSize></distTranOps></distInfo><mdHrLv><ScopeCd value="005" Sync="TRUE"></ScopeCd></mdHrLv><mdHrLvName Sync="TRUE">dataset</mdHrLvName><refSysInfo><RefSystem><refSysID><identCode code="3404" Sync="TRUE"></identCode><idCodeSpace Sync="TRUE">EPSG</idCodeSpace><idVersion Sync="TRUE">7.11.2</idVersion></refSysID></RefSystem></refSysInfo><spatRepInfo><VectSpatRep><geometObjs Name="poi"><geoObjTyp><GeoObjTypCd value="004" Sync="TRUE"></GeoObjTypCd></geoObjTyp><geoObjCnt Sync="TRUE">0</geoObjCnt></geometObjs><topLvl><TopoLevCd value="001" Sync="TRUE"></TopoLevCd></topLvl></VectSpatRep></spatRepInfo><spdoinfo><ptvctinf><esriterm Name="poi"><efeatyp Sync="TRUE">Simple</efeatyp><efeageom code="1" Sync="TRUE"></efeageom><esritopo Sync="TRUE">FALSE</esritopo><efeacnt Sync="TRUE">0</efeacnt><spindex Sync="TRUE">FALSE</spindex><linrefer Sync="TRUE">TRUE</linrefer></esriterm></ptvctinf></spdoinfo><eainfo><detailed Name="poi"><enttyp><enttypl Sync="TRUE">poi</enttypl><enttypt Sync="TRUE">Feature Class</enttypt><enttypc Sync="TRUE">0</enttypc></enttyp><attr><attrlabl Sync="TRUE">FID</attrlabl><attalias Sync="TRUE">FID</attalias><attrtype Sync="TRUE">OID</attrtype><attwidth Sync="TRUE">4</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Internal feature number.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Sequential unique whole numbers that are automatically generated.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">Shape</attrlabl><attalias Sync="TRUE">Shape</attalias><attrtype Sync="TRUE">Geometry</attrtype><attwidth Sync="TRUE">0</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Feature geometry.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Coordinates defining the features.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">interst_id</attrlabl><attalias Sync="TRUE">interst_id</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">20</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">state_d</attrlabl><attalias Sync="TRUE">state_d</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">16</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">cnty_name</attrlabl><attalias Sync="TRUE">cnty_name</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">50</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">latitude</attrlabl><attalias Sync="TRUE">latitude</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">19</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">longitude</attrlabl><attalias Sync="TRUE">longitude</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">19</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Name</attrlabl><attalias Sync="TRUE">Name</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">50</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Website</attrlabl><attalias Sync="TRUE">Website</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">100</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr></detailed></eainfo><mdDateSt Sync="TRUE">20121204</mdDateSt></metadata>
diff --git a/tests/data/shp/points/poi.zip b/tests/data/shp/points/poi.zip
new file mode 100644
index 000000000..66f40bc46
Binary files /dev/null and b/tests/data/shp/points/poi.zip differ
diff --git a/tests/data/shp/points/poi_ogr.dbf b/tests/data/shp/points/poi_ogr.dbf
new file mode 100644
index 000000000..47066180b
Binary files /dev/null and b/tests/data/shp/points/poi_ogr.dbf differ
diff --git a/tests/data/shp/points/poi_ogr.prj b/tests/data/shp/points/poi_ogr.prj
new file mode 100644
index 000000000..1bca7ccec
--- /dev/null
+++ b/tests/data/shp/points/poi_ogr.prj
@@ -0,0 +1 @@
+PROJCS["NAD_1983_HARN_StatePlane_North_Carolina_FIPS_3200_Feet",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",2000000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-79.0],PARAMETER["Standard_Parallel_1",34.33333333333334],PARAMETER["Standard_Parallel_2",36.16666666666666],PARAMETER["Latitude_Of_Origin",33.75],UNIT["Foot_US",0.30480060960121924]]
\ No newline at end of file
diff --git a/tests/data/shp/points/poi_ogr.shp b/tests/data/shp/points/poi_ogr.shp
new file mode 100644
index 000000000..a50e78f87
Binary files /dev/null and b/tests/data/shp/points/poi_ogr.shp differ
diff --git a/tests/data/shp/points/poi_ogr.shx b/tests/data/shp/points/poi_ogr.shx
new file mode 100644
index 000000000..d05f21dbb
Binary files /dev/null and b/tests/data/shp/points/poi_ogr.shx differ
diff --git a/tests/data/shp/points/qgis.dbf b/tests/data/shp/points/qgis.dbf
new file mode 100644
index 000000000..be97f7eb9
Binary files /dev/null and b/tests/data/shp/points/qgis.dbf differ
diff --git a/tests/data/shp/points/qgis.prj b/tests/data/shp/points/qgis.prj
new file mode 100644
index 000000000..a30c00a55
--- /dev/null
+++ b/tests/data/shp/points/qgis.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
diff --git a/tests/data/shp/points/qgis.qpj b/tests/data/shp/points/qgis.qpj
new file mode 100644
index 000000000..5fbc831e7
--- /dev/null
+++ b/tests/data/shp/points/qgis.qpj
@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]
diff --git a/tests/data/shp/points/qgis.shp b/tests/data/shp/points/qgis.shp
new file mode 100644
index 000000000..c3c635164
Binary files /dev/null and b/tests/data/shp/points/qgis.shp differ
diff --git a/tests/data/shp/points/qgis.shx b/tests/data/shp/points/qgis.shx
new file mode 100644
index 000000000..d7e283456
Binary files /dev/null and b/tests/data/shp/points/qgis.shx differ
diff --git a/tests/data/shp/points/qgis_multi.dbf b/tests/data/shp/points/qgis_multi.dbf
new file mode 100644
index 000000000..839e3b4fe
Binary files /dev/null and b/tests/data/shp/points/qgis_multi.dbf differ
diff --git a/tests/data/shp/points/qgis_multi.prj b/tests/data/shp/points/qgis_multi.prj
new file mode 100644
index 000000000..a30c00a55
--- /dev/null
+++ b/tests/data/shp/points/qgis_multi.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
diff --git a/tests/data/shp/points/qgis_multi.qpj b/tests/data/shp/points/qgis_multi.qpj
new file mode 100644
index 000000000..5fbc831e7
--- /dev/null
+++ b/tests/data/shp/points/qgis_multi.qpj
@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]
diff --git a/tests/data/shp/points/qgis_multi.shp b/tests/data/shp/points/qgis_multi.shp
new file mode 100644
index 000000000..53af804d4
Binary files /dev/null and b/tests/data/shp/points/qgis_multi.shp differ
diff --git a/tests/data/shp/points/qgis_multi.shx b/tests/data/shp/points/qgis_multi.shx
new file mode 100644
index 000000000..6c761fd4d
Binary files /dev/null and b/tests/data/shp/points/qgis_multi.shx differ
diff --git a/tests/python_tests/shapefile_test.py b/tests/python_tests/shapefile_test.py
index c447f1e04..2a47fca71 100644
--- a/tests/python_tests/shapefile_test.py
+++ b/tests/python_tests/shapefile_test.py
@@ -70,6 +70,45 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
         eq_(feat['NUMERIC'],32)
         eq_(feat['DATE'],'20121202')
 
+    # created by hand in qgis 1.8.0
+    def test_shapefile_point2d_from_qgis():
+        ds = mapnik.Shapefile(file='../data/shp/points/qgis.shp')
+        eq_(len(ds.fields()),2)
+        eq_(ds.fields(),['id','name'])
+        eq_(ds.field_types(),['int','str'])
+        eq_(len(ds.all_features()),3)
+
+    # ogr2ogr tests/data/shp/3dpoint/ogr_zfield.shp tests/data/shp/3dpoint/qgis.shp -zfield id
+    def test_shapefile_point_z_from_qgis():
+        ds = mapnik.Shapefile(file='../data/shp/points/ogr_zfield.shp')
+        eq_(len(ds.fields()),2)
+        eq_(ds.fields(),['id','name'])
+        eq_(ds.field_types(),['int','str'])
+        eq_(len(ds.all_features()),3)
+
+    def test_shapefile_multipoint_from_qgis():
+        ds = mapnik.Shapefile(file='../data/shp/points/qgis_multi.shp')
+        eq_(len(ds.fields()),2)
+        eq_(ds.fields(),['id','name'])
+        eq_(ds.field_types(),['int','str'])
+        eq_(len(ds.all_features()),1)
+
+    # pointzm from arcinfo
+    def test_shapefile_point_zm_from_arcgis():
+        ds = mapnik.Shapefile(file='../data/shp/points/poi.shp')
+        eq_(len(ds.fields()),7)
+        eq_(ds.fields(),['interst_id', 'state_d', 'cnty_name', 'latitude', 'longitude', 'Name', 'Website'])
+        eq_(ds.field_types(),['str', 'str', 'str', 'float', 'float', 'str', 'str'])
+        eq_(len(ds.all_features()),17)
+
+    # copy of the above with ogr2ogr that makes m record 14 instead of 18
+    def test_shapefile_point_zm_from_ogr():
+        ds = mapnik.Shapefile(file='../data/shp/points/poi_ogr.shp')
+        eq_(len(ds.fields()),7)
+        eq_(ds.fields(),['interst_id', 'state_d', 'cnty_name', 'latitude', 'longitude', 'Name', 'Website'])
+        eq_(ds.field_types(),['str', 'str', 'str', 'float', 'float', 'str', 'str'])
+        eq_(len(ds.all_features()),17)
+
 if __name__ == "__main__":
     setup()
     [eval(run)() for run in dir() if 'test_' in run]