diff --git a/tests/cpp_tests/font_registration_test.cpp b/tests/cpp_tests/font_registration_test.cpp
index 072c4dc30..1906d896b 100644
--- a/tests/cpp_tests/font_registration_test.cpp
+++ b/tests/cpp_tests/font_registration_test.cpp
@@ -1,4 +1,4 @@
-#include <boost/config/warning_disable.hpp>
+//#include <boost/config/warning_disable.hpp>
 
 #include <boost/filesystem/convenience.hpp>
 namespace fs = boost::filesystem;
@@ -6,8 +6,8 @@ using fs::path;
 namespace sys = boost::system;
 
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/bind.hpp>
-#include <fstream>
+//#include <boost/bind.hpp>
+//#include <fstream>
 #include <iostream>
 #include <mapnik/font_engine_freetype.hpp>
 
diff --git a/tests/data/good_maps/agg_poly_gamma_map.xml b/tests/data/good_maps/agg_poly_gamma_map.xml
index d5f3bd882..ef608e532 100644
--- a/tests/data/good_maps/agg_poly_gamma_map.xml
+++ b/tests/data/good_maps/agg_poly_gamma_map.xml
@@ -1,4 +1,4 @@
-<Map srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs" background-color="steelblue" minimum-version="0.7.2">
+<Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="steelblue" minimum-version="0.7.2">
     <Style name="style">
         
         <!-- Asia - default dark color behind light polygon 
@@ -37,7 +37,7 @@
             <PolygonSymbolizer fill="rgb(212,9,14)"/>
         </Rule>
     </Style>
-    <Layer name="world" srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs">
+    <Layer name="world" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
         <StyleName>style</StyleName>
         <Datasource>
             <Parameter name="file">../../data/shp/world_merc</Parameter>
diff --git a/tests/data/good_maps/bounds_clipping.xml b/tests/data/good_maps/bounds_clipping.xml
index 921a5cac8..0901f78b0 100644
--- a/tests/data/good_maps/bounds_clipping.xml
+++ b/tests/data/good_maps/bounds_clipping.xml
@@ -16,7 +16,7 @@ nik2img.py tests/data/good_maps/bounds_clipping.xml t.png -d 256 256 -e -2003750
 -->
 
 <Map 
-  srs="+init=epsg:900913" 
+  srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" 
   minimum-version="2.0.0" 
   buffer-size="128"
   maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34"
diff --git a/tests/data/good_maps/text_rotation.xml b/tests/data/good_maps/text_rotation.xml
index 17110375d..837d807a9 100644
--- a/tests/data/good_maps/text_rotation.xml
+++ b/tests/data/good_maps/text_rotation.xml
@@ -1,4 +1,4 @@
-<Map srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs" background-color="steelblue" minimum-version="0.7.2">
+<Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="steelblue" minimum-version="0.7.2">
 
     <Style name="labels">
         <Rule title="foo">
diff --git a/tests/data/good_maps/xinclude/layers.xml b/tests/data/good_maps/xinclude/layers.xml
index ab177032d..1dda44255 100644
--- a/tests/data/good_maps/xinclude/layers.xml
+++ b/tests/data/good_maps/xinclude/layers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include  xmlns:xi="http://www.w3.org/2001/XInclude">
 
-    <Layer name="world_borders" srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs">
+    <Layer name="world_borders" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
         <StyleName>world_borders_style</StyleName>
         <StyleName>point_style</StyleName>
         <Datasource>
diff --git a/tests/data/good_maps/xinclude/layers_with_entities.xml b/tests/data/good_maps/xinclude/layers_with_entities.xml
index 3727b98b9..a611112ac 100644
--- a/tests/data/good_maps/xinclude/layers_with_entities.xml
+++ b/tests/data/good_maps/xinclude/layers_with_entities.xml
@@ -3,7 +3,7 @@
 
 <Include  xmlns:xi="http://www.w3.org/2001/XInclude">
 
-    <Layer name="world_borders" minzoom="&zoom02min;" maxzoom="&zoom00max;" srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs">
+    <Layer name="world_borders" minzoom="&zoom02min;" maxzoom="&zoom00max;" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
         <StyleName>world_borders_style</StyleName>
         <StyleName>point_style</StyleName>
         <Datasource>