diff --git a/bindings/python/mapnik_parameters.cpp b/bindings/python/mapnik_parameters.cpp
index 9bc746756..21504d3ba 100644
--- a/bindings/python/mapnik_parameters.cpp
+++ b/bindings/python/mapnik_parameters.cpp
@@ -196,6 +196,12 @@ std::shared_ptr<mapnik::parameter> create_parameter(mapnik::value_unicode_string
     return std::make_shared<mapnik::parameter>(key_utf8,value);
 }
 
+bool contains(mapnik::parameters const& p, std::string const& key)
+{
+    parameters::const_iterator pos = p.find(key);
+    return pos != p.end();
+}
+
 // needed for Python_Unicode to std::string (utf8) conversion
 
 std::shared_ptr<mapnik::parameter> create_parameter_from_string(mapnik::value_unicode_string const& key, mapnik::value_unicode_string const& ustr)
@@ -233,6 +239,7 @@ void export_parameters()
         .def("__getitem__",get_params_by_key2)
         .def("__getitem__",get_params_by_index)
         .def("__len__",get_params_size)
+        .def("__contains__",contains)
         .def("append",add_parameter)
         .def("iteritems",iterator<parameters>())
         ;
diff --git a/tests/visual_tests/styles/building-symbolizer-opacity.xml b/tests/visual_tests/styles/building-symbolizer-opacity.xml
index b6db1c611..5ddd40d4c 100644
--- a/tests/visual_tests/styles/building-symbolizer-opacity.xml
+++ b/tests/visual_tests/styles/building-symbolizer-opacity.xml
@@ -4,6 +4,9 @@
   background-image-opacity=".5"
   background-image-comp-op="soft-light"
   >
+    <Parameters>
+        <Parameter name="sizes">512, 512</Parameter>
+    </Parameters>
     <Style name="ellipse">
         <Rule>
             <BuildingSymbolizer fill="white" fill-opacity=".5" />
@@ -17,5 +20,4 @@
             <Parameter name="file">../data/marker-multi-policy.csv</Parameter>
         </Datasource>
     </Layer>
-    
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/charspacing-lines.xml b/tests/visual_tests/styles/charspacing-lines.xml
index 36ffe7312..c2dd336b2 100644
--- a/tests/visual_tests/styles/charspacing-lines.xml
+++ b/tests/visual_tests/styles/charspacing-lines.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">300, 300</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/charspacing.xml b/tests/visual_tests/styles/charspacing.xml
index 3afbdfd66..4a90770c1 100644
--- a/tests/visual_tests/styles/charspacing.xml
+++ b/tests/visual_tests/styles/charspacing.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">200, 400</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
+                <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
                 <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/collision.xml b/tests/visual_tests/styles/collision.xml
index 7b717fc9f..27cfa53c2 100644
--- a/tests/visual_tests/styles/collision.xml
+++ b/tests/visual_tests/styles/collision.xml
@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 
   <Style name="line">
     <Rule>
diff --git a/tests/visual_tests/styles/colorize-alpha1.xml b/tests/visual_tests/styles/colorize-alpha1.xml
index e4f70077c..7431d6638 100644
--- a/tests/visual_tests/styles/colorize-alpha1.xml
+++ b/tests/visual_tests/styles/colorize-alpha1.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries">
     <Rule>
@@ -46,4 +49,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/colorize-alpha2.xml b/tests/visual_tests/styles/colorize-alpha2.xml
index 852825ca4..7301586a4 100644
--- a/tests/visual_tests/styles/colorize-alpha2.xml
+++ b/tests/visual_tests/styles/colorize-alpha2.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries">
     <Rule>
@@ -46,4 +49,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/colorize-alpha3.xml b/tests/visual_tests/styles/colorize-alpha3.xml
index ac4a41f50..12a7407c5 100644
--- a/tests/visual_tests/styles/colorize-alpha3.xml
+++ b/tests/visual_tests/styles/colorize-alpha3.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries">
     <Rule>
@@ -46,4 +49,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/colorize-alpha4.xml b/tests/visual_tests/styles/colorize-alpha4.xml
index 8ae5750f5..8db16a8f6 100644
--- a/tests/visual_tests/styles/colorize-alpha4.xml
+++ b/tests/visual_tests/styles/colorize-alpha4.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map>
+  <Parameters>
+    <Parameter name="sizes">256,256</Parameter>
+    <Parameter name="status">off</Parameter>
+  </Parameters>
 
   <Style name="countries">
     <Rule>
@@ -46,4 +50,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/dst-over-compositing.xml b/tests/visual_tests/styles/dst-over-compositing.xml
index c8623fe85..8ebefe298 100644
--- a/tests/visual_tests/styles/dst-over-compositing.xml
+++ b/tests/visual_tests/styles/dst-over-compositing.xml
@@ -1,6 +1,9 @@
 <Map 
   background-color="#808080"
   srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
 
     <Style name="My Style" comp-op="src-over">
         <Rule>
@@ -16,4 +19,4 @@
         </Datasource>
     </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/expressionformat.xml b/tests/visual_tests/styles/expressionformat.xml
index 4a6315bdd..596fb4a92 100644
--- a/tests/visual_tests/styles/expressionformat.xml
+++ b/tests/visual_tests/styles/expressionformat.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/formatting-1.xml b/tests/visual_tests/styles/formatting-1.xml
index ee3f40d42..d83012b9d 100644
--- a/tests/visual_tests/styles/formatting-1.xml
+++ b/tests/visual_tests/styles/formatting-1.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/formatting-2.xml b/tests/visual_tests/styles/formatting-2.xml
index ca7646a47..043dcafb9 100644
--- a/tests/visual_tests/styles/formatting-2.xml
+++ b/tests/visual_tests/styles/formatting-2.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/formatting-3.xml b/tests/visual_tests/styles/formatting-3.xml
index eb9e449fe..8724228b1 100644
--- a/tests/visual_tests/styles/formatting-3.xml
+++ b/tests/visual_tests/styles/formatting-3.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/formatting-4.xml b/tests/visual_tests/styles/formatting-4.xml
index 984a654fb..f8adcb16d 100644
--- a/tests/visual_tests/styles/formatting-4.xml
+++ b/tests/visual_tests/styles/formatting-4.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/formatting-5.xml b/tests/visual_tests/styles/formatting-5.xml
index 5e3d8bdf5..563682c51 100644
--- a/tests/visual_tests/styles/formatting-5.xml
+++ b/tests/visual_tests/styles/formatting-5.xml
@@ -9,6 +9,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/formatting-6.xml b/tests/visual_tests/styles/formatting-6.xml
index 8432fdd3e..38637f420 100644
--- a/tests/visual_tests/styles/formatting-6.xml
+++ b/tests/visual_tests/styles/formatting-6.xml
@@ -12,6 +12,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/formatting-7.xml b/tests/visual_tests/styles/formatting-7.xml
index 815d44f8c..78b4f9ef9 100644
--- a/tests/visual_tests/styles/formatting-7.xml
+++ b/tests/visual_tests/styles/formatting-7.xml
@@ -9,6 +9,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/formatting-8.xml b/tests/visual_tests/styles/formatting-8.xml
index ae3ee7be1..eea114cd1 100644
--- a/tests/visual_tests/styles/formatting-8.xml
+++ b/tests/visual_tests/styles/formatting-8.xml
@@ -9,6 +9,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/formatting-expr-alignment.xml b/tests/visual_tests/styles/formatting-expr-alignment.xml
index 46ec4bfe7..27741bec7 100644
--- a/tests/visual_tests/styles/formatting-expr-alignment.xml
+++ b/tests/visual_tests/styles/formatting-expr-alignment.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">500, 500</Parameter>
+  </Parameters>
   <FontSet name="book">
     <Font face-name="DejaVu Sans Book"/>
   </FontSet>
@@ -9,6 +12,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.5, -0.5, 0.5, 0.5</Parameter>
 <Parameter name="inline">
 lat,long,horizontal_alignment,vertical_alignment,dy,text
  0.25,-0.35,left,top,0
diff --git a/tests/visual_tests/styles/formatting.xml b/tests/visual_tests/styles/formatting.xml
index 541d7c1e1..cdec59b5a 100644
--- a/tests/visual_tests/styles/formatting.xml
+++ b/tests/visual_tests/styles/formatting.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+  <Parameters>
+    <Parameter name="sizes">256,256</Parameter>
+    <Parameter name="status">off</Parameter>
+  </Parameters>
 
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/functional-expressions-length.xml b/tests/visual_tests/styles/functional-expressions-length.xml
index f2243c48d..a462aff1d 100644
--- a/tests/visual_tests/styles/functional-expressions-length.xml
+++ b/tests/visual_tests/styles/functional-expressions-length.xml
@@ -1,4 +1,7 @@
 <Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">512, 512</Parameter>
+  </Parameters>
   <FontSet name="book-fonts">
     <Font face-name="DejaVu Sans Book"/>
   </FontSet>
@@ -23,6 +26,7 @@
     <StyleName>frame</StyleName>
     <Datasource>
       <Parameter name="type">ogr</Parameter>
+      <Parameter name="extent">-15,-15,15,15</Parameter>
       <Parameter name="layer_by_index">0</Parameter>
       <Parameter name="inline"><![CDATA[
       {
diff --git a/tests/visual_tests/styles/functional-expressions.xml b/tests/visual_tests/styles/functional-expressions.xml
index dd45a0079..f222f45a3 100644
--- a/tests/visual_tests/styles/functional-expressions.xml
+++ b/tests/visual_tests/styles/functional-expressions.xml
@@ -1,4 +1,7 @@
 <Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="frame" filter-mode="first">
         <Rule>
@@ -26,6 +29,7 @@
         <StyleName>frame</StyleName>
         <Datasource>
             <Parameter name="type">ogr</Parameter>
+            <Parameter name="extent">-10,-10,10,10</Parameter>
             <Parameter name="layer_by_index">0</Parameter>
             <Parameter name="inline"><![CDATA[
                 {
@@ -61,4 +65,4 @@
                 }]]></Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/gdal-filter-factor.xml b/tests/visual_tests/styles/gdal-filter-factor.xml
index 22554e31d..00e37402d 100644
--- a/tests/visual_tests/styles/gdal-filter-factor.xml
+++ b/tests/visual_tests/styles/gdal-filter-factor.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="white">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 
 <Style name="test">
   <Rule>
@@ -14,4 +17,4 @@
     </Datasource>
 </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/geometry-transform-scale-patterns.xml b/tests/visual_tests/styles/geometry-transform-scale-patterns.xml
index 563913bca..bc9bbad9a 100644
--- a/tests/visual_tests/styles/geometry-transform-scale-patterns.xml
+++ b/tests/visual_tests/styles/geometry-transform-scale-patterns.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">500,500</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>polygon</StyleName>
diff --git a/tests/visual_tests/styles/geometry-transform-scale.xml b/tests/visual_tests/styles/geometry-transform-scale.xml
index 628720b93..17301e034 100644
--- a/tests/visual_tests/styles/geometry-transform-scale.xml
+++ b/tests/visual_tests/styles/geometry-transform-scale.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">500,500</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>polygon</StyleName>
diff --git a/tests/visual_tests/styles/geometry-transform-translate-patterns-svg.xml b/tests/visual_tests/styles/geometry-transform-translate-patterns-svg.xml
index 633eb085a..8db8c1a21 100644
--- a/tests/visual_tests/styles/geometry-transform-translate-patterns-svg.xml
+++ b/tests/visual_tests/styles/geometry-transform-translate-patterns-svg.xml
@@ -1,4 +1,7 @@
 <Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">200,200</Parameter>
+    </Parameters>
 
     <Style name="polygon">
         <Rule>
diff --git a/tests/visual_tests/styles/geometry-transform-translate-patterns.xml b/tests/visual_tests/styles/geometry-transform-translate-patterns.xml
index 16702b98d..611a05124 100644
--- a/tests/visual_tests/styles/geometry-transform-translate-patterns.xml
+++ b/tests/visual_tests/styles/geometry-transform-translate-patterns.xml
@@ -1,4 +1,7 @@
 <Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">200,200</Parameter>
+    </Parameters>
 
     <Style name="polygon">
         <Rule>
diff --git a/tests/visual_tests/styles/geometry-transform-translate.xml b/tests/visual_tests/styles/geometry-transform-translate.xml
index e61bf5a81..0bf4e93e2 100644
--- a/tests/visual_tests/styles/geometry-transform-translate.xml
+++ b/tests/visual_tests/styles/geometry-transform-translate.xml
@@ -1,4 +1,7 @@
 <Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">200,200</Parameter>
+    </Parameters>
 
     <Style name="polygon">
         <Rule>
diff --git a/tests/visual_tests/styles/group-symbolizer-1.xml b/tests/visual_tests/styles/group-symbolizer-1.xml
index 5245dbdef..5d282ebda 100644
--- a/tests/visual_tests/styles/group-symbolizer-1.xml
+++ b/tests/visual_tests/styles/group-symbolizer-1.xml
@@ -2,6 +2,9 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>points</StyleName>
diff --git a/tests/visual_tests/styles/group-symbolizer-2.xml b/tests/visual_tests/styles/group-symbolizer-2.xml
index 45a3336b6..d07c58da4 100644
--- a/tests/visual_tests/styles/group-symbolizer-2.xml
+++ b/tests/visual_tests/styles/group-symbolizer-2.xml
@@ -2,6 +2,9 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Layer name="obstacle" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>obstacle</StyleName>
diff --git a/tests/visual_tests/styles/group-symbolizer-3.xml b/tests/visual_tests/styles/group-symbolizer-3.xml
index b6d38e97d..67a36c443 100644
--- a/tests/visual_tests/styles/group-symbolizer-3.xml
+++ b/tests/visual_tests/styles/group-symbolizer-3.xml
@@ -2,6 +2,9 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512,256</Parameter>
+  </Parameters>
 
   <Layer name="obstacle" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>obstacle</StyleName>
diff --git a/tests/visual_tests/styles/group-symbolizer-line-1.xml b/tests/visual_tests/styles/group-symbolizer-line-1.xml
index 4025c7521..17c1f55f8 100644
--- a/tests/visual_tests/styles/group-symbolizer-line-1.xml
+++ b/tests/visual_tests/styles/group-symbolizer-line-1.xml
@@ -2,6 +2,9 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Layer name="alpha" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>alpha</StyleName>
diff --git a/tests/visual_tests/styles/group-symbolizer-line-2.xml b/tests/visual_tests/styles/group-symbolizer-line-2.xml
index d5de91a65..b883c6235 100644
--- a/tests/visual_tests/styles/group-symbolizer-line-2.xml
+++ b/tests/visual_tests/styles/group-symbolizer-line-2.xml
@@ -2,6 +2,9 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <!-- the aim here is to test the "repeat-key" parameter. it is
      supposed to stop collidable / placeable items from being
diff --git a/tests/visual_tests/styles/halo-comp-op-on-satellite.xml b/tests/visual_tests/styles/halo-comp-op-on-satellite.xml
index 8694a3f64..f55116915 100644
--- a/tests/visual_tests/styles/halo-comp-op-on-satellite.xml
+++ b/tests/visual_tests/styles/halo-comp-op-on-satellite.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">450,450</Parameter>
+  </Parameters>
 
 <Style name="raster">
   <Rule>
@@ -99,4 +102,4 @@
     </Datasource>
 </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/harfbuzz.xml b/tests/visual_tests/styles/harfbuzz.xml
index b1b9473b9..8f2fb086c 100644
--- a/tests/visual_tests/styles/harfbuzz.xml
+++ b/tests/visual_tests/styles/harfbuzz.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 200</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
+                <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
                 <Parameter name="file">../data/points.csv</Parameter>
-                <Parameter name="extent">-1,-1,1,1</Parameter>
             </Datasource>
     </Layer>
 
diff --git a/tests/visual_tests/styles/hb-fontsets.xml b/tests/visual_tests/styles/hb-fontsets.xml
index 6310edb32..70173e677 100644
--- a/tests/visual_tests/styles/hb-fontsets.xml
+++ b/tests/visual_tests/styles/hb-fontsets.xml
@@ -2,13 +2,16 @@
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84"
      font-directory="../fonts/KhmerOS/">
+    <Parameters>
+        <Parameter name="sizes">800, 200</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
-                <Parameter name="file">../data/points.csv</Parameter>
                 <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
+                <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
 
diff --git a/tests/visual_tests/styles/image-filters-galore.xml b/tests/visual_tests/styles/image-filters-galore.xml
index 48e402883..7ca2bc01b 100644
--- a/tests/visual_tests/styles/image-filters-galore.xml
+++ b/tests/visual_tests/styles/image-filters-galore.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map background-color="#b8dee6" buffer-size="256" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries-mask" filter-mode="first" comp-op="difference">
     <Rule>
@@ -28,4 +31,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/image-filters-multi-blur-inflate.xml b/tests/visual_tests/styles/image-filters-multi-blur-inflate.xml
index ac68bba20..0422d659e 100644
--- a/tests/visual_tests/styles/image-filters-multi-blur-inflate.xml
+++ b/tests/visual_tests/styles/image-filters-multi-blur-inflate.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map background-color="#b8dee6" buffer-size="256" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries-over" filter-mode="first">
     <Rule>
@@ -28,4 +31,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/image-filters-multi-blur.xml b/tests/visual_tests/styles/image-filters-multi-blur.xml
index fd9b9bc38..71192ae6d 100644
--- a/tests/visual_tests/styles/image-filters-multi-blur.xml
+++ b/tests/visual_tests/styles/image-filters-multi-blur.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map background-color="#b8dee6" buffer-size="256" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="countries-over" filter-mode="first">
     <Rule>
@@ -28,4 +31,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/jalign-auto.xml b/tests/visual_tests/styles/jalign-auto.xml
index 2ee79edd5..fda1c0885 100644
--- a/tests/visual_tests/styles/jalign-auto.xml
+++ b/tests/visual_tests/styles/jalign-auto.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">200, 200</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
@@ -17,7 +21,7 @@
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="-30" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="0" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="30" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
-            
+
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="30" dy="0" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="-30" dy="0" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
 
diff --git a/tests/visual_tests/styles/khmer.xml b/tests/visual_tests/styles/khmer.xml
index 4d2eddc24..5bf3626be 100644
--- a/tests/visual_tests/styles/khmer.xml
+++ b/tests/visual_tests/styles/khmer.xml
@@ -2,11 +2,15 @@
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84"
      font-directory="../fonts/KhmerOS/">
+    <Parameters>
+        <Parameter name="sizes">800, 200</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
+                <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
                 <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/line-offset.xml b/tests/visual_tests/styles/line-offset.xml
index 8f4dee7ae..acdb7d700 100644
--- a/tests/visual_tests/styles/line-offset.xml
+++ b/tests/visual_tests/styles/line-offset.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">900, 250</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-5.192, 50.189, -5.174, 50.195</Parameter>
             <Parameter name="file">../data/line-offset.csv</Parameter>
         </Datasource>
     </Layer>
@@ -26,4 +30,4 @@
             <TextSymbolizer size="10" fill="#000" placement="line" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
         </Rule>
     </Style>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/line-opacity-multi-render.xml b/tests/visual_tests/styles/line-opacity-multi-render.xml
index f4ad94d48..37bda8e7d 100644
--- a/tests/visual_tests/styles/line-opacity-multi-render.xml
+++ b/tests/visual_tests/styles/line-opacity-multi-render.xml
@@ -1,4 +1,7 @@
 <Map srs="+init=epsg:3857" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Style name="polygon" filter-mode="first" >
       <Rule>
         <LineSymbolizer stroke-width="50" stroke-opacity="0.01" />
@@ -77,4 +80,4 @@ wkt
         </Datasource>
     </Layer>
     
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/line-pattern-smooth-and-offset.xml b/tests/visual_tests/styles/line-pattern-smooth-and-offset.xml
index 66f037d76..86286459e 100755
--- a/tests/visual_tests/styles/line-pattern-smooth-and-offset.xml
+++ b/tests/visual_tests/styles/line-pattern-smooth-and-offset.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Map background-color="white">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
 
     <Style name="style">
         <Rule>
diff --git a/tests/visual_tests/styles/line-pattern-symbolizer-opacity.xml b/tests/visual_tests/styles/line-pattern-symbolizer-opacity.xml
index 82a92fb2a..44a490e6f 100644
--- a/tests/visual_tests/styles/line-pattern-symbolizer-opacity.xml
+++ b/tests/visual_tests/styles/line-pattern-symbolizer-opacity.xml
@@ -4,6 +4,9 @@
     background-image-opacity=".5"
     background-image-comp-op="soft-light"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
diff --git a/tests/visual_tests/styles/line-pattern-symbolizer.xml b/tests/visual_tests/styles/line-pattern-symbolizer.xml
index c1cd9b3a5..d770d54f9 100644
--- a/tests/visual_tests/styles/line-pattern-symbolizer.xml
+++ b/tests/visual_tests/styles/line-pattern-symbolizer.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">900, 250</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-5.192, 50.189, -5.174, 50.195</Parameter>
             <Parameter name="file">../data/line-offset.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/line-smooth-and-offset.xml b/tests/visual_tests/styles/line-smooth-and-offset.xml
index 172a3f72c..87203ce9c 100755
--- a/tests/visual_tests/styles/line-smooth-and-offset.xml
+++ b/tests/visual_tests/styles/line-smooth-and-offset.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Map background-color="white">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
 
     <Style name="style">
         <Rule>
diff --git a/tests/visual_tests/styles/line-symbolizer-expressions-all.xml b/tests/visual_tests/styles/line-symbolizer-expressions-all.xml
index 880cfe193..da5bc73fd 100644
--- a/tests/visual_tests/styles/line-symbolizer-expressions-all.xml
+++ b/tests/visual_tests/styles/line-symbolizer-expressions-all.xml
@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>
diff --git a/tests/visual_tests/styles/line-symbolizer-expressions.xml b/tests/visual_tests/styles/line-symbolizer-expressions.xml
index ff3cf7950..2e224b8e5 100644
--- a/tests/visual_tests/styles/line-symbolizer-expressions.xml
+++ b/tests/visual_tests/styles/line-symbolizer-expressions.xml
@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>
diff --git a/tests/visual_tests/styles/line_break.xml b/tests/visual_tests/styles/line_break.xml
index c39fd6c9e..0e56506e0 100644
--- a/tests/visual_tests/styles/line_break.xml
+++ b/tests/visual_tests/styles/line_break.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
+                <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
                 <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/lines-1.xml b/tests/visual_tests/styles/lines-1.xml
index 086f99205..11dae3909 100644
--- a/tests/visual_tests/styles/lines-1.xml
+++ b/tests/visual_tests/styles/lines-1.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/lines-2.xml b/tests/visual_tests/styles/lines-2.xml
index 9ea6e585c..43a48717e 100644
--- a/tests/visual_tests/styles/lines-2.xml
+++ b/tests/visual_tests/styles/lines-2.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/lines-3.xml b/tests/visual_tests/styles/lines-3.xml
index 3164b2349..475ef9344 100644
--- a/tests/visual_tests/styles/lines-3.xml
+++ b/tests/visual_tests/styles/lines-3.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/lines-4.xml b/tests/visual_tests/styles/lines-4.xml
index f65a4dcd3..bc20e7900 100644
--- a/tests/visual_tests/styles/lines-4.xml
+++ b/tests/visual_tests/styles/lines-4.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>
diff --git a/tests/visual_tests/styles/lines-5.xml b/tests/visual_tests/styles/lines-5.xml
index a8b91bf0a..55ff6593e 100644
--- a/tests/visual_tests/styles/lines-5.xml
+++ b/tests/visual_tests/styles/lines-5.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- dy and multi lines test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>
@@ -11,7 +15,7 @@
             <Parameter name="file">../data/lines2.csv</Parameter>
         </Datasource>
     </Layer>
-    
+
     <Style name="lines">
         <Rule>
             <LineSymbolizer stroke-width="12" stroke="green"/>
diff --git a/tests/visual_tests/styles/lines-6.xml b/tests/visual_tests/styles/lines-6.xml
index 101cda11c..644954c97 100644
--- a/tests/visual_tests/styles/lines-6.xml
+++ b/tests/visual_tests/styles/lines-6.xml
@@ -3,6 +3,10 @@
 <!-- complex script on line test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84"
      font-directory="../fonts/KhmerOS/">
+     <Parameters>
+         <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+         <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+     </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>
diff --git a/tests/visual_tests/styles/lines-7.xml b/tests/visual_tests/styles/lines-7.xml
index ae4faa5f5..08a6861a3 100644
--- a/tests/visual_tests/styles/lines-7.xml
+++ b/tests/visual_tests/styles/lines-7.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- dy and multi lines test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-1.2, -1.2, 1.2, 1.2</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>
@@ -14,7 +18,7 @@ wkt,nr
 </Parameter>
         </Datasource>
     </Layer>
-    
+
     <Style name="lines">
         <Rule>
             <LineSymbolizer stroke-width="1" stroke="green"/>
diff --git a/tests/visual_tests/styles/lines-multi-layout-1.xml b/tests/visual_tests/styles/lines-multi-layout-1.xml
index 7a8f8d890..635603be7 100644
--- a/tests/visual_tests/styles/lines-multi-layout-1.xml
+++ b/tests/visual_tests/styles/lines-multi-layout-1.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>
diff --git a/tests/visual_tests/styles/lines-multi-layout-2.xml b/tests/visual_tests/styles/lines-multi-layout-2.xml
index c09445744..3a3addc37 100644
--- a/tests/visual_tests/styles/lines-multi-layout-2.xml
+++ b/tests/visual_tests/styles/lines-multi-layout-2.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+        <Parameter name="bbox">-1.2, -1.2, 1.2, 1.2</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>
diff --git a/tests/visual_tests/styles/lines-multi-layout-shield.xml b/tests/visual_tests/styles/lines-multi-layout-shield.xml
index 708cac234..686838c09 100644
--- a/tests/visual_tests/styles/lines-multi-layout-shield.xml
+++ b/tests/visual_tests/styles/lines-multi-layout-shield.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>lines</StyleName>
diff --git a/tests/visual_tests/styles/lines-shield.xml b/tests/visual_tests/styles/lines-shield.xml
index 638439909..9c29df7b9 100644
--- a/tests/visual_tests/styles/lines-shield.xml
+++ b/tests/visual_tests/styles/lines-shield.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">800, 800; 600, 600; 400, 400; 200, 200</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/list.xml b/tests/visual_tests/styles/list.xml
index d1332be80..d62e2a1c0 100644
--- a/tests/visual_tests/styles/list.xml
+++ b/tests/visual_tests/styles/list.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">800, 100; 600, 100; 400, 100; 300, 100; 250, 100; 150, 100; 100, 100</Parameter>
+  </Parameters>
 
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/map-background-image-compositing.xml b/tests/visual_tests/styles/map-background-image-compositing.xml
index 9bedf747b..69550bebb 100644
--- a/tests/visual_tests/styles/map-background-image-compositing.xml
+++ b/tests/visual_tests/styles/map-background-image-compositing.xml
@@ -3,6 +3,9 @@
   background-image-opacity=".8"
   background-image-comp-op="screen"
   background-image="../data/pattern.png">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
 
     <Style name="ellipse">
         <Rule>
@@ -50,5 +53,5 @@ x,y
             </Parameter>
         </Datasource>
     </Layer>
-    
-</Map>
\ No newline at end of file
+
+</Map>
diff --git a/tests/visual_tests/styles/marker-collide.xml b/tests/visual_tests/styles/marker-collide.xml
index de45a80d8..8115bfc8a 100644
--- a/tests/visual_tests/styles/marker-collide.xml
+++ b/tests/visual_tests/styles/marker-collide.xml
@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="line">
     <Rule>
@@ -49,4 +52,4 @@ i|wkt
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/marker-interior-position.xml b/tests/visual_tests/styles/marker-interior-position.xml
index 08945ef80..6fdd44897 100644
--- a/tests/visual_tests/styles/marker-interior-position.xml
+++ b/tests/visual_tests/styles/marker-interior-position.xml
@@ -1,7 +1,10 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
+
     <Style name="poly">
         <Rule>
             <PolygonSymbolizer />
@@ -10,7 +13,7 @@
             <DebugSymbolizer />
         </Rule>
     </Style>
-    
+
     <Layer name="bug" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>poly</StyleName>
         <Datasource>
@@ -22,4 +25,4 @@
             </Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/marker-line-placement-many-vertices.xml b/tests/visual_tests/styles/marker-line-placement-many-vertices.xml
index 66cc71ea2..6c9d155d2 100644
--- a/tests/visual_tests/styles/marker-line-placement-many-vertices.xml
+++ b/tests/visual_tests/styles/marker-line-placement-many-vertices.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="white">
+    <Parameters>
+        <Parameter name="sizes">600, 400</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
         <StyleName>My Style</StyleName>
         <Datasource>
diff --git a/tests/visual_tests/styles/marker-multi-policy.xml b/tests/visual_tests/styles/marker-multi-policy.xml
index 937cc15ae..7c77c3ec4 100644
--- a/tests/visual_tests/styles/marker-multi-policy.xml
+++ b/tests/visual_tests/styles/marker-multi-policy.xml
@@ -1,4 +1,7 @@
 <Map maximum-extent="0,0,190,180">
+  <Parameters>
+     <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 <Style name="each">
   <Rule>
     <Filter>[i] = 1</Filter>
diff --git a/tests/visual_tests/styles/marker-on-hex-grid.xml b/tests/visual_tests/styles/marker-on-hex-grid.xml
index 4da597ec0..1f6684222 100644
--- a/tests/visual_tests/styles/marker-on-hex-grid.xml
+++ b/tests/visual_tests/styles/marker-on-hex-grid.xml
@@ -1,5 +1,8 @@
 <!DOCTYPE Map>
 <Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
+    <Parameters>
+        <Parameter name="sizes">600,400; 400,600; 257,256</Parameter>
+    </Parameters>
     <Style name="1">
         <Rule>
             <LineSymbolizer stroke-width=".2" stroke="grey"/>
diff --git a/tests/visual_tests/styles/marker-on-line-and-avoid-edges.xml b/tests/visual_tests/styles/marker-on-line-and-avoid-edges.xml
index e347b2913..812a00a4f 100644
--- a/tests/visual_tests/styles/marker-on-line-and-avoid-edges.xml
+++ b/tests/visual_tests/styles/marker-on-line-and-avoid-edges.xml
@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 <Style name="line" filter-mode="first" >
   <Rule>
     <LineSymbolizer stroke="#000000" />
diff --git a/tests/visual_tests/styles/marker-on-line-and-line-placement.xml b/tests/visual_tests/styles/marker-on-line-and-line-placement.xml
index 6cbdcebd4..86808053a 100644
--- a/tests/visual_tests/styles/marker-on-line-and-line-placement.xml
+++ b/tests/visual_tests/styles/marker-on-line-and-line-placement.xml
@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+     <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 <Style name="line" filter-mode="first" >
   <Rule>
     <LineSymbolizer stroke="red"/>
@@ -21,6 +24,7 @@
     <StyleName>point-placement</StyleName>
     <Datasource>
        <Parameter name="type">csv</Parameter>
+       <Parameter name="extent">-10, 0, 15, 20</Parameter>
        <Parameter name="file">../data/marker-on-line.csv</Parameter>
        <Parameter name="separator">|</Parameter>
     </Datasource>
diff --git a/tests/visual_tests/styles/marker-on-line-and-vertex-first-placement.xml b/tests/visual_tests/styles/marker-on-line-and-vertex-first-placement.xml
index e001cd4d2..58b1d2508 100644
--- a/tests/visual_tests/styles/marker-on-line-and-vertex-first-placement.xml
+++ b/tests/visual_tests/styles/marker-on-line-and-vertex-first-placement.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map>
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
     <Style name="lines">
         <Rule>
             <LineSymbolizer stroke="#000000" />
@@ -17,6 +20,7 @@
         <StyleName>markers</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-1, -1, 11, 4</Parameter>
             <Parameter name="inline">
             wkt, placement
             "LINESTRING(0 0)", "vertex-first"
diff --git a/tests/visual_tests/styles/marker-on-line-and-vertex-last-placement.xml b/tests/visual_tests/styles/marker-on-line-and-vertex-last-placement.xml
index b35a65d1a..5afaa3f6a 100644
--- a/tests/visual_tests/styles/marker-on-line-and-vertex-last-placement.xml
+++ b/tests/visual_tests/styles/marker-on-line-and-vertex-last-placement.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map>
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
     <Style name="lines">
         <Rule>
             <LineSymbolizer stroke="#000000" />
@@ -17,6 +20,7 @@
         <StyleName>markers</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-1, -1, 11, 4</Parameter>
             <Parameter name="inline">
             wkt, placement
             "LINESTRING(0 0)", "vertex-last"
diff --git a/tests/visual_tests/styles/marker-on-line-spacing-eq-width-overlap.xml b/tests/visual_tests/styles/marker-on-line-spacing-eq-width-overlap.xml
index 3b58e5430..21294b5cc 100644
--- a/tests/visual_tests/styles/marker-on-line-spacing-eq-width-overlap.xml
+++ b/tests/visual_tests/styles/marker-on-line-spacing-eq-width-overlap.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>alpha</StyleName>
         <Datasource>
@@ -51,4 +54,4 @@
             <DebugSymbolizer />
         </Rule>
     </Style>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/marker-on-line-spacing-eq-width.xml b/tests/visual_tests/styles/marker-on-line-spacing-eq-width.xml
index c4ad7d961..c4962ce9b 100644
--- a/tests/visual_tests/styles/marker-on-line-spacing-eq-width.xml
+++ b/tests/visual_tests/styles/marker-on-line-spacing-eq-width.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>alpha</StyleName>
         <Datasource>
@@ -50,4 +53,4 @@
             <LineSymbolizer stroke-width="0.2" stroke="#ff0000" />
         </Rule>
     </Style>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/marker-on-line.xml b/tests/visual_tests/styles/marker-on-line.xml
index 42f67a425..87d22f1f9 100644
--- a/tests/visual_tests/styles/marker-on-line.xml
+++ b/tests/visual_tests/styles/marker-on-line.xml
@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+     <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 <Style name="line" filter-mode="first" >
   <Rule>
     <LineSymbolizer stroke="#000000" />
@@ -15,6 +18,7 @@
     <StyleName>point-placement</StyleName>
     <Datasource>
        <Parameter name="type">csv</Parameter>
+       <Parameter name="extent">-10, 0, 15, 20</Parameter>
        <Parameter name="file">../data/marker-on-line.csv</Parameter>
        <Parameter name="separator">|</Parameter>
     </Datasource>
diff --git a/tests/visual_tests/styles/marker-recenter-collide.xml b/tests/visual_tests/styles/marker-recenter-collide.xml
index 3f22b242d..9ace272ee 100644
--- a/tests/visual_tests/styles/marker-recenter-collide.xml
+++ b/tests/visual_tests/styles/marker-recenter-collide.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+  <Parameters>
+    <Parameter name="sizes">256,128</Parameter>
+  </Parameters>
+
     <Style name="point">
         <Rule>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" dx="[offset]" dy="[offset]">"I"</TextSymbolizer>
@@ -14,6 +17,7 @@
         <StyleName>point</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-1,-0.5,1,0.5</Parameter>
             <Parameter name="inline">
                 lat,lon,offset
                 0,-0.35,10
diff --git a/tests/visual_tests/styles/marker-symbolizer-expressions-all.xml b/tests/visual_tests/styles/marker-symbolizer-expressions-all.xml
index f488668d2..273d553d5 100644
--- a/tests/visual_tests/styles/marker-symbolizer-expressions-all.xml
+++ b/tests/visual_tests/styles/marker-symbolizer-expressions-all.xml
@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>
diff --git a/tests/visual_tests/styles/marker-vs-point.xml b/tests/visual_tests/styles/marker-vs-point.xml
index 361f43ee1..4bcc7d082 100644
--- a/tests/visual_tests/styles/marker-vs-point.xml
+++ b/tests/visual_tests/styles/marker-vs-point.xml
@@ -3,7 +3,10 @@
      background-image-opacity="0.8"
      background-image-comp-op="screen"
      background-image="../data/pattern.png">
-  
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
+
   <Style name="markers">
     <Rule>
       <MarkersSymbolizer
@@ -34,7 +37,7 @@ x,y
       </Parameter>
     </Datasource>
   </Layer>
-  
+
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>points</StyleName>
     <Datasource>
@@ -47,16 +50,16 @@ x,y
       </Parameter>
     </Datasource>
   </Layer>
-  
+
   <!-- points to frame data view -->
-  
+
   <Style name="frame">
     <Rule>
       <PointSymbolizer />
       <DebugSymbolizer />
     </Rule>
   </Style>
-  
+
   <Layer name="frame" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>frame</StyleName>
     <Datasource>
@@ -71,4 +74,4 @@ x,y
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/marker-whole-multi-polygon.xml b/tests/visual_tests/styles/marker-whole-multi-polygon.xml
index 110ef7f78..4b95c31f1 100644
--- a/tests/visual_tests/styles/marker-whole-multi-polygon.xml
+++ b/tests/visual_tests/styles/marker-whole-multi-polygon.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Style name="style">
         <Rule>
             <PolygonSymbolizer fill="white"/>
@@ -14,4 +17,4 @@
             <Parameter name="type">shape</Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/marker-with-background-image-and-hsla-transform.xml b/tests/visual_tests/styles/marker-with-background-image-and-hsla-transform.xml
index 96a0756a3..fd1cb679c 100644
--- a/tests/visual_tests/styles/marker-with-background-image-and-hsla-transform.xml
+++ b/tests/visual_tests/styles/marker-with-background-image-and-hsla-transform.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-image="../../data/images/checker.jpg">
+    <Parameters>
+        <Parameter name="sizes">600,400; 400,600; 257,256</Parameter>
+    </Parameters>
 
     <Style name="ellipse"
       direct-image-filters="scale-hsla(0,1,0,1,0,1,0,.5)"
@@ -65,5 +68,5 @@ x,y
             </Parameter>
         </Datasource>
     </Layer>
-    
-</Map>
\ No newline at end of file
+
+</Map>
diff --git a/tests/visual_tests/styles/marker-with-background-image.xml b/tests/visual_tests/styles/marker-with-background-image.xml
index 9eff84b8a..316450ce3 100644
--- a/tests/visual_tests/styles/marker-with-background-image.xml
+++ b/tests/visual_tests/styles/marker-with-background-image.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-image="../../data/images/checker.jpg">
+    <Parameters>
+        <Parameter name="sizes">600,400; 400,600; 257,256</Parameter>
+    </Parameters>
 
     <Style name="ellipse">
         <Rule>
@@ -63,4 +66,4 @@ x,y
         </Datasource>
     </Layer>
     
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/orientation.xml b/tests/visual_tests/styles/orientation.xml
index e0e283b78..97aa91cb8 100644
--- a/tests/visual_tests/styles/orientation.xml
+++ b/tests/visual_tests/styles/orientation.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 200</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
@@ -14,7 +18,7 @@
         <Rule>
             <Filter>[nr] = 1</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="45">"XYZ"</TextSymbolizer>
-            <PointSymbolizer allow-overlap="true"/> 
+            <PointSymbolizer allow-overlap="true"/>
         </Rule>
         <Rule>
             <Filter>[nr] = 2</Filter>
diff --git a/tests/visual_tests/styles/point-symbolizer-expressions-all.xml b/tests/visual_tests/styles/point-symbolizer-expressions-all.xml
index e9cf2a16e..d5953435e 100644
--- a/tests/visual_tests/styles/point-symbolizer-expressions-all.xml
+++ b/tests/visual_tests/styles/point-symbolizer-expressions-all.xml
@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>
diff --git a/tests/visual_tests/styles/point-symbolizer-expressions.xml b/tests/visual_tests/styles/point-symbolizer-expressions.xml
index bab6fb918..838d4f641 100644
--- a/tests/visual_tests/styles/point-symbolizer-expressions.xml
+++ b/tests/visual_tests/styles/point-symbolizer-expressions.xml
@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>
diff --git a/tests/visual_tests/styles/point-symbolizer-overlap-placement-expr.xml b/tests/visual_tests/styles/point-symbolizer-overlap-placement-expr.xml
index e39d56ea2..7594edee9 100644
--- a/tests/visual_tests/styles/point-symbolizer-overlap-placement-expr.xml
+++ b/tests/visual_tests/styles/point-symbolizer-overlap-placement-expr.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">500, 500</Parameter>
+  </Parameters>
   <FontSet name="book">
     <Font face-name="DejaVu Sans Book"/>
   </FontSet>
@@ -9,6 +12,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.5, -0.5, 0.5, 0.5</Parameter>
 <Parameter name="inline">
 lat,long,overlap,placement
  0.33,-0.36,noexpr-true,noexpr-false
diff --git a/tests/visual_tests/styles/polygon-symbolizer-expressions-all.xml b/tests/visual_tests/styles/polygon-symbolizer-expressions-all.xml
index e80d67b79..e81f9a678 100644
--- a/tests/visual_tests/styles/polygon-symbolizer-expressions-all.xml
+++ b/tests/visual_tests/styles/polygon-symbolizer-expressions-all.xml
@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>
diff --git a/tests/visual_tests/styles/polygon-symbolizer-expressions.xml b/tests/visual_tests/styles/polygon-symbolizer-expressions.xml
index 916f30a37..48920ddb6 100644
--- a/tests/visual_tests/styles/polygon-symbolizer-expressions.xml
+++ b/tests/visual_tests/styles/polygon-symbolizer-expressions.xml
@@ -1,6 +1,9 @@
 <Map
     background-color="#eee"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
 
     <Style name="bug">
         <Rule>
diff --git a/tests/visual_tests/styles/polygon-winding-order.xml b/tests/visual_tests/styles/polygon-winding-order.xml
index e949e7d7a..36eeb4276 100644
--- a/tests/visual_tests/styles/polygon-winding-order.xml
+++ b/tests/visual_tests/styles/polygon-winding-order.xml
@@ -1,6 +1,9 @@
 <Map
     background-color="#000"
     srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">300,300</Parameter>
+    </Parameters>
 
     <Style name="polygon">
         <Rule>
@@ -58,4 +61,4 @@ Polygon((-75.0 -75.0, -75.0 75.0, 35.0 75.0, 35.0 -75.0, -75.0 -75.0))|bounds
 }</Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/postgis-inline.xml b/tests/visual_tests/styles/postgis-inline.xml
index 7b24b72b1..38df0ef85 100644
--- a/tests/visual_tests/styles/postgis-inline.xml
+++ b/tests/visual_tests/styles/postgis-inline.xml
@@ -1,4 +1,7 @@
 <Map srs="+init=epsg:3857" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 <Style name="carto_tests" filter-mode="first" >
     <Rule>
         <LineSymbolizer stroke="[stroke]" />
diff --git a/tests/visual_tests/styles/raster-color-to-alpha1.xml b/tests/visual_tests/styles/raster-color-to-alpha1.xml
index 5a66751ef..8207a683a 100644
--- a/tests/visual_tests/styles/raster-color-to-alpha1.xml
+++ b/tests/visual_tests/styles/raster-color-to-alpha1.xml
@@ -1,5 +1,8 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over"
 >
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <Style name="style" image-filters="color-to-alpha(#00BDFF)">
   <Rule>
@@ -16,4 +19,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/raster-color-to-alpha2.xml b/tests/visual_tests/styles/raster-color-to-alpha2.xml
index cd0206ef4..c9846411f 100644
--- a/tests/visual_tests/styles/raster-color-to-alpha2.xml
+++ b/tests/visual_tests/styles/raster-color-to-alpha2.xml
@@ -1,6 +1,9 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over"
  background-color="steelblue"
 >
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <Style name="style" image-filters="color-to-alpha(#BCDAF5)">
   <Rule>
@@ -17,4 +20,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/raster-color-to-alpha3.xml b/tests/visual_tests/styles/raster-color-to-alpha3.xml
index 393e50669..94e5bb365 100644
--- a/tests/visual_tests/styles/raster-color-to-alpha3.xml
+++ b/tests/visual_tests/styles/raster-color-to-alpha3.xml
@@ -1,6 +1,9 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over"
  background-color="steelblue"
 >
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <Style name="style" image-filters="color-to-alpha(black)">
   <Rule>
@@ -17,4 +20,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/raster-color-to-alpha4.xml b/tests/visual_tests/styles/raster-color-to-alpha4.xml
index 40fbdc08a..1a99481f8 100644
--- a/tests/visual_tests/styles/raster-color-to-alpha4.xml
+++ b/tests/visual_tests/styles/raster-color-to-alpha4.xml
@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+init=epsg:32630" minimum-version="0.7.2">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="DISCRETE RAINBOW" direct-image-filters="color-to-alpha(white)" image-filters="color-to-alpha(yellow),color-to-alpha(blue)">
     <Rule>
@@ -24,4 +27,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/raster-color-to-alpha5.xml b/tests/visual_tests/styles/raster-color-to-alpha5.xml
index 6a2f4add6..e6acda42b 100644
--- a/tests/visual_tests/styles/raster-color-to-alpha5.xml
+++ b/tests/visual_tests/styles/raster-color-to-alpha5.xml
@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+init=epsg:32630" minimum-version="0.7.2">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="DISCRETE RAINBOW" image-filters="color-to-alpha(black)">
     <Rule>
@@ -24,4 +27,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/raster_colorizer.xml b/tests/visual_tests/styles/raster_colorizer.xml
index 8c1c91831..6954118b4 100644
--- a/tests/visual_tests/styles/raster_colorizer.xml
+++ b/tests/visual_tests/styles/raster_colorizer.xml
@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+init=epsg:32630" minimum-version="0.7.2">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <!-- blue yellow orange indigo green red transparent black white -->
 
@@ -68,4 +71,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/raster_symbolizer.xml b/tests/visual_tests/styles/raster_symbolizer.xml
index 14632b103..7375f9523 100644
--- a/tests/visual_tests/styles/raster_symbolizer.xml
+++ b/tests/visual_tests/styles/raster_symbolizer.xml
@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+init=epsg:32630" minimum-version="0.7.2">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
   <Style name="two-value">
     <Rule>
@@ -32,4 +35,4 @@
       </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/repeat-labels-1.xml b/tests/visual_tests/styles/repeat-labels-1.xml
index 1938a6a99..a84350fcb 100644
--- a/tests/visual_tests/styles/repeat-labels-1.xml
+++ b/tests/visual_tests/styles/repeat-labels-1.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+    <Parameters>
+        <Parameter name="sizes">750,250</Parameter>
+    </Parameters>
+
     <Style name="line">
         <Rule>
             <LineSymbolizer stroke-width="8" stroke="orange"/>
         </Rule>
     </Style>
-    
+
     <Style name="marker">
         <Rule>
             <Filter>[type] = 'poi'</Filter>
             <MarkersSymbolizer />
         </Rule>
     </Style>
-    
+
     <Style name="shield">
         <Rule>
             <Filter>[type] = 'motorway'</Filter>
@@ -36,6 +39,7 @@
         <StyleName>text</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-12, -4, 12, 4</Parameter>
             <Parameter name="file">../data/repeat-labels.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/repeat-labels-2.xml b/tests/visual_tests/styles/repeat-labels-2.xml
index 64b359c40..8d9452e11 100644
--- a/tests/visual_tests/styles/repeat-labels-2.xml
+++ b/tests/visual_tests/styles/repeat-labels-2.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+    <Parameters>
+        <Parameter name="sizes">750,250</Parameter>
+    </Parameters>
+
     <Style name="line">
         <Rule>
             <LineSymbolizer stroke-width="8" stroke="orange"/>
         </Rule>
     </Style>
-    
+
     <Style name="marker">
         <Rule>
             <Filter>[type] = 'poi'</Filter>
             <MarkersSymbolizer />
         </Rule>
     </Style>
-    
+
     <Style name="shield">
         <Rule>
             <Filter>[type] = 'motorway'</Filter>
@@ -36,6 +39,7 @@
         <StyleName>text</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-12, -4, 12, 4</Parameter>
             <Parameter name="file">../data/repeat-labels.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/repeat-labels-3.xml b/tests/visual_tests/styles/repeat-labels-3.xml
index e767c00fb..84f64eb23 100644
--- a/tests/visual_tests/styles/repeat-labels-3.xml
+++ b/tests/visual_tests/styles/repeat-labels-3.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+    <Parameters>
+        <Parameter name="sizes">750,250</Parameter>
+    </Parameters>
+
     <Style name="line">
         <Rule>
             <LineSymbolizer stroke-width="8" stroke="orange"/>
         </Rule>
     </Style>
-    
+
     <Style name="marker">
         <Rule>
             <Filter>[type] = 'poi'</Filter>
             <MarkersSymbolizer />
         </Rule>
     </Style>
-    
+
     <Style name="shield">
         <Rule>
             <Filter>[type] = 'motorway'</Filter>
@@ -36,6 +39,7 @@
         <StyleName>text</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-12, -4, 12, 4</Parameter>
             <Parameter name="file">../data/repeat-labels.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/repeat-labels-4.xml b/tests/visual_tests/styles/repeat-labels-4.xml
index 88476f342..3a3505f54 100644
--- a/tests/visual_tests/styles/repeat-labels-4.xml
+++ b/tests/visual_tests/styles/repeat-labels-4.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
-    
+    <Parameters>
+        <Parameter name="sizes">750,250</Parameter>
+    </Parameters>
+
     <Style name="line">
         <Rule>
             <LineSymbolizer stroke-width="8" stroke="orange"/>
         </Rule>
     </Style>
-    
+
     <Style name="marker">
         <Rule>
             <Filter>[type] = 'poi'</Filter>
             <MarkersSymbolizer />
         </Rule>
     </Style>
-    
+
     <Style name="shield">
         <Rule>
             <Filter>[type] = 'motorway'</Filter>
@@ -36,6 +39,7 @@
         <StyleName>text</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-12, -4, 12, 4</Parameter>
             <Parameter name="file">../data/repeat-labels.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/road-casings-grouped-rendering.xml b/tests/visual_tests/styles/road-casings-grouped-rendering.xml
index 49b490e3f..ddaa021fd 100644
--- a/tests/visual_tests/styles/road-casings-grouped-rendering.xml
+++ b/tests/visual_tests/styles/road-casings-grouped-rendering.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="#dfd8c9">
+  <Parameters>
+    <Parameter name="sizes">600,600</Parameter>
+    <Parameter name="bbox">1477001.12245,6890242.37746,1480004.49012,6892244.62256</Parameter>
+  </Parameters>
 
 <Style name="marking" filter-mode="first">
   <Rule>
@@ -66,4 +70,4 @@ FROM roads ORDER BY z_order) AS road</Parameter>
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/road-casings-non-grouped-rendering.xml b/tests/visual_tests/styles/road-casings-non-grouped-rendering.xml
index 3d29d93ee..5287ed5ba 100644
--- a/tests/visual_tests/styles/road-casings-non-grouped-rendering.xml
+++ b/tests/visual_tests/styles/road-casings-non-grouped-rendering.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="#dfd8c9">
+  <Parameters>
+    <Parameter name="sizes">600,600</Parameter>
+    <Parameter name="bbox">1477001.12245,6890242.37746,1480004.49012,6892244.62256</Parameter>
+  </Parameters>
 
 <Style name="marking" filter-mode="first">
   <Rule>
@@ -64,4 +68,4 @@ FROM roads ORDER BY z_order) AS road</Parameter>
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/rtl-point.xml b/tests/visual_tests/styles/rtl-point.xml
index 5236f94ee..8406f5581 100644
--- a/tests/visual_tests/styles/rtl-point.xml
+++ b/tests/visual_tests/styles/rtl-point.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">200, 200</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/shield-on-line-and-avoid-edges.xml b/tests/visual_tests/styles/shield-on-line-and-avoid-edges.xml
index 22dd1f464..e6d9d7b21 100644
--- a/tests/visual_tests/styles/shield-on-line-and-avoid-edges.xml
+++ b/tests/visual_tests/styles/shield-on-line-and-avoid-edges.xml
@@ -1,4 +1,7 @@
 <Map>
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 <Style name="line" filter-mode="first" >
   <Rule>
     <LineSymbolizer stroke="#000000" />
diff --git a/tests/visual_tests/styles/shield-on-line-spacing-eq-width.xml b/tests/visual_tests/styles/shield-on-line-spacing-eq-width.xml
index 0ae09daa8..25a151b22 100644
--- a/tests/visual_tests/styles/shield-on-line-spacing-eq-width.xml
+++ b/tests/visual_tests/styles/shield-on-line-spacing-eq-width.xml
@@ -1,4 +1,7 @@
 <Map background-color="steelblue" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>alpha</StyleName>
         <Datasource>
@@ -96,4 +99,4 @@
             <LineSymbolizer stroke-width="0.2" stroke="#ff0000" />
         </Rule>
     </Style>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/shield-on-polygon.xml b/tests/visual_tests/styles/shield-on-polygon.xml
index c4f2f9e55..da92ef1ec 100644
--- a/tests/visual_tests/styles/shield-on-polygon.xml
+++ b/tests/visual_tests/styles/shield-on-polygon.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+init=epsg:4326" background-color="#b8dee6">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 
 <Parameters>
   <Parameter name="bounds">-180,-85.05112877980659,180,85.05112877980659</Parameter>
@@ -46,4 +49,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-1.xml b/tests/visual_tests/styles/shieldsymbolizer-1.xml
index 0af96590a..848ca0ede 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-1.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-1.xml
@@ -2,11 +2,15 @@
 <!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+    <Parameters>
+        <Parameter name="sizes">490, 100; 495, 100; 497, 100; 498, 100; 499, 100; 500, 100; 501, 100; 502, 100; 505, 100; 510, 100</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-2.xml b/tests/visual_tests/styles/shieldsymbolizer-2.xml
index 7acf4276d..9f4473bcf 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-2.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-2.xml
@@ -2,11 +2,15 @@
 <!-- With unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=latlong +datum=WGS84" minimum-version="2.0.0">
+    <Parameters>
+        <Parameter name="sizes">490, 100; 495, 100; 497, 100; 498, 100; 499, 100; 500, 100; 501, 100; 502, 100; 505, 100; 510, 100</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-3.xml b/tests/visual_tests/styles/shieldsymbolizer-3.xml
index 01e3dc151..67c60f54c 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-3.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-3.xml
@@ -2,11 +2,15 @@
 <!-- Without unlock-image, with shield-dx -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=latlong +datum=WGS84" minimum-version="2.0.0">
+    <Parameters>
+        <Parameter name="sizes">490, 100; 495, 100; 497, 100; 498, 100; 499, 100; 500, 100; 501, 100; 502, 100; 505, 100; 510, 100</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-4.xml b/tests/visual_tests/styles/shieldsymbolizer-4.xml
index 14fe55ebf..6693ba00a 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-4.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-4.xml
@@ -2,11 +2,15 @@
 <!-- With unlock-image and shield-dx -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=latlong +datum=WGS84" minimum-version="2.0.0">
+    <Parameters>
+        <Parameter name="sizes">490, 100; 495, 100; 497, 100; 498, 100; 499, 100; 500, 100; 501, 100; 502, 100; 505, 100; 510, 100</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/simple-E.xml b/tests/visual_tests/styles/simple-E.xml
index d937efa01..799a3d65c 100644
--- a/tests/visual_tests/styles/simple-E.xml
+++ b/tests/visual_tests/styles/simple-E.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/simple-N.xml b/tests/visual_tests/styles/simple-N.xml
index a5e6eebdf..5b9b79d15 100644
--- a/tests/visual_tests/styles/simple-N.xml
+++ b/tests/visual_tests/styles/simple-N.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/simple-NE.xml b/tests/visual_tests/styles/simple-NE.xml
index 8589c77d9..aee999c0e 100644
--- a/tests/visual_tests/styles/simple-NE.xml
+++ b/tests/visual_tests/styles/simple-NE.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/simple-NW.xml b/tests/visual_tests/styles/simple-NW.xml
index c133eb16e..bf4d35ffe 100644
--- a/tests/visual_tests/styles/simple-NW.xml
+++ b/tests/visual_tests/styles/simple-NW.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/simple-S.xml b/tests/visual_tests/styles/simple-S.xml
index 2ceb0c594..a868ea30a 100644
--- a/tests/visual_tests/styles/simple-S.xml
+++ b/tests/visual_tests/styles/simple-S.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/simple-SE.xml b/tests/visual_tests/styles/simple-SE.xml
index eea79a652..5c411a0e2 100644
--- a/tests/visual_tests/styles/simple-SE.xml
+++ b/tests/visual_tests/styles/simple-SE.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/simple-SW.xml b/tests/visual_tests/styles/simple-SW.xml
index d7038b308..bc0712931 100644
--- a/tests/visual_tests/styles/simple-SW.xml
+++ b/tests/visual_tests/styles/simple-SW.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/simple-W.xml b/tests/visual_tests/styles/simple-W.xml
index ea8258984..f687644ca 100644
--- a/tests/visual_tests/styles/simple-W.xml
+++ b/tests/visual_tests/styles/simple-W.xml
@@ -6,6 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/simple-shield.xml b/tests/visual_tests/styles/simple-shield.xml
index 80efe2c6e..3ea2f6442 100644
--- a/tests/visual_tests/styles/simple-shield.xml
+++ b/tests/visual_tests/styles/simple-shield.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/simple.xml b/tests/visual_tests/styles/simple.xml
index a10fbdac5..ff4492542 100644
--- a/tests/visual_tests/styles/simple.xml
+++ b/tests/visual_tests/styles/simple.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">800, 100; 600, 100; 400, 100; 300, 100; 250, 100; 150, 100; 100, 100</Parameter>
+  </Parameters>
 
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/simplify-douglas-peucker.xml b/tests/visual_tests/styles/simplify-douglas-peucker.xml
index 8580801b0..2553c3829 100644
--- a/tests/visual_tests/styles/simplify-douglas-peucker.xml
+++ b/tests/visual_tests/styles/simplify-douglas-peucker.xml
@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
+    <Parameters>
+        <Parameter name="sizes">500, 1000</Parameter>
+    </Parameters>
     <Style name="lines">
         <Rule>
             <LineSymbolizer simplify-algorithm="[algorithm]" simplify="[simplify]" geometry-transform="translate(0, [ty])" />
diff --git a/tests/visual_tests/styles/simplify-radial-distance.xml b/tests/visual_tests/styles/simplify-radial-distance.xml
index f1cf968f2..3ad3e3ec8 100644
--- a/tests/visual_tests/styles/simplify-radial-distance.xml
+++ b/tests/visual_tests/styles/simplify-radial-distance.xml
@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
+    <Parameters>
+        <Parameter name="sizes">500, 1000</Parameter>
+    </Parameters>
     <Style name="lines">
         <Rule>
             <LineSymbolizer simplify-algorithm="[algorithm]" simplify="[simplify]" geometry-transform="translate(0, [ty])" />
diff --git a/tests/visual_tests/styles/simplify-visvalingam-whyatt.xml b/tests/visual_tests/styles/simplify-visvalingam-whyatt.xml
index 40dd92acb..623857e45 100644
--- a/tests/visual_tests/styles/simplify-visvalingam-whyatt.xml
+++ b/tests/visual_tests/styles/simplify-visvalingam-whyatt.xml
@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
+    <Parameters>
+        <Parameter name="sizes">500, 1000</Parameter>
+    </Parameters>
     <Style name="lines">
         <Rule>
             <LineSymbolizer simplify-algorithm="[algorithm]" simplify="[simplify]" geometry-transform="translate(0, [ty])" />
diff --git a/tests/visual_tests/styles/simplify-zhao-saalfeld.xml b/tests/visual_tests/styles/simplify-zhao-saalfeld.xml
index 9703b7c8b..3f46226d2 100644
--- a/tests/visual_tests/styles/simplify-zhao-saalfeld.xml
+++ b/tests/visual_tests/styles/simplify-zhao-saalfeld.xml
@@ -1,4 +1,7 @@
 <Map background-color="white" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
+    <Parameters>
+        <Parameter name="sizes">500, 1000</Parameter>
+    </Parameters>
     <Style name="lines">
         <Rule>
             <LineSymbolizer simplify-algorithm="[algorithm]" simplify="[simplify]" geometry-transform="translate(0, [ty])" />
diff --git a/tests/visual_tests/styles/style-level-compositing-tiled-0,0.xml b/tests/visual_tests/styles/style-level-compositing-tiled-0,0.xml
index a3d8f32b1..e88d964c5 100644
--- a/tests/visual_tests/styles/style-level-compositing-tiled-0,0.xml
+++ b/tests/visual_tests/styles/style-level-compositing-tiled-0,0.xml
@@ -1,4 +1,8 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="purple">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+        <Parameter name="bbox">-20037508.342,0,0,20037508.342</Parameter>
+    </Parameters>
     <Style name="style" direct-image-filters="agg-stack-blur(5,5)" image-filters-inflate="true">
         <Rule>
             <PolygonSymbolizer fill="yellow" fill-opacity=".6"/>
@@ -27,4 +31,4 @@
             <Parameter name="type">csv</Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/style-level-compositing-tiled-0,1.xml b/tests/visual_tests/styles/style-level-compositing-tiled-0,1.xml
index a3d8f32b1..e88a99ed2 100644
--- a/tests/visual_tests/styles/style-level-compositing-tiled-0,1.xml
+++ b/tests/visual_tests/styles/style-level-compositing-tiled-0,1.xml
@@ -1,4 +1,8 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="purple">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+        <Parameter name="bbox">-20037508.342,-20037508.342,0,0</Parameter>
+    </Parameters>
     <Style name="style" direct-image-filters="agg-stack-blur(5,5)" image-filters-inflate="true">
         <Rule>
             <PolygonSymbolizer fill="yellow" fill-opacity=".6"/>
@@ -27,4 +31,4 @@
             <Parameter name="type">csv</Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/style-level-compositing-tiled-1,0.xml b/tests/visual_tests/styles/style-level-compositing-tiled-1,0.xml
index a3d8f32b1..a0d4257df 100644
--- a/tests/visual_tests/styles/style-level-compositing-tiled-1,0.xml
+++ b/tests/visual_tests/styles/style-level-compositing-tiled-1,0.xml
@@ -1,4 +1,8 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="purple">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+        <Parameter name="bbox">0,0,20037508.342,20037508.342</Parameter>
+    </Parameters>
     <Style name="style" direct-image-filters="agg-stack-blur(5,5)" image-filters-inflate="true">
         <Rule>
             <PolygonSymbolizer fill="yellow" fill-opacity=".6"/>
@@ -27,4 +31,4 @@
             <Parameter name="type">csv</Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/style-level-compositing-tiled-1,1.xml b/tests/visual_tests/styles/style-level-compositing-tiled-1,1.xml
index 55177a9b8..4b158c4c5 100644
--- a/tests/visual_tests/styles/style-level-compositing-tiled-1,1.xml
+++ b/tests/visual_tests/styles/style-level-compositing-tiled-1,1.xml
@@ -1,4 +1,8 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="purple">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+        <Parameter name="bbox">0,-20037508.342,20037508.342,0</Parameter>
+    </Parameters>
     <Style name="style" direct-image-filters="agg-stack-blur(5,5)" image-filters-inflate="true">
         <Rule>
             <PolygonSymbolizer fill="yellow" fill-opacity=".6"/>
@@ -27,4 +31,4 @@
             <Parameter name="type">csv</Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/text-allow-overlap-expr.xml b/tests/visual_tests/styles/text-allow-overlap-expr.xml
index ee85083da..ec447c9b2 100644
--- a/tests/visual_tests/styles/text-allow-overlap-expr.xml
+++ b/tests/visual_tests/styles/text-allow-overlap-expr.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">500, 500</Parameter>
+  </Parameters>
   <FontSet name="book">
     <Font face-name="DejaVu Sans Book"/>
   </FontSet>
@@ -9,6 +12,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.5, -0.5, 0.5, 0.5</Parameter>
 <Parameter name="inline">
 lat,long,test,text
  0.25,-0.35,noexpr-true,ABC
diff --git a/tests/visual_tests/styles/text-bengali.xml b/tests/visual_tests/styles/text-bengali.xml
index e21f6df0b..9e9e9d37b 100644
--- a/tests/visual_tests/styles/text-bengali.xml
+++ b/tests/visual_tests/styles/text-bengali.xml
@@ -6,13 +6,16 @@
 -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84"
      font-directory="../fonts/lohit-bengali-ttf-2.5.3/">
+    <Parameters>
+        <Parameter name="sizes">800, 100</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
 	    <StyleName>My Style</StyleName>
 	    <Datasource>
     		<Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
     		<Parameter name="file">../data/points.csv</Parameter>
-            <Parameter name="extent">-1,-1,1,1</Parameter>
 	    </Datasource>
     </Layer>
     <Style name="My Style">
diff --git a/tests/visual_tests/styles/text-bug1532.xml b/tests/visual_tests/styles/text-bug1532.xml
index 0c0130ee8..4076756a3 100644
--- a/tests/visual_tests/styles/text-bug1532.xml
+++ b/tests/visual_tests/styles/text-bug1532.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE Map>
 <!-- Minimal testcase for bug #1523. -->
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">600, 165</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
diff --git a/tests/visual_tests/styles/text-bug1533.xml b/tests/visual_tests/styles/text-bug1533.xml
index 986b15a89..7e3e19f6d 100644
--- a/tests/visual_tests/styles/text-bug1533.xml
+++ b/tests/visual_tests/styles/text-bug1533.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE Map>
 <!-- Minimal testcase for bug #1533. -->
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">600, 600</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
diff --git a/tests/visual_tests/styles/text-bug1820+0.xml b/tests/visual_tests/styles/text-bug1820+0.xml
index eed6d358d..2220d6051 100644
--- a/tests/visual_tests/styles/text-bug1820+0.xml
+++ b/tests/visual_tests/styles/text-bug1820+0.xml
@@ -2,10 +2,14 @@
 <!DOCTYPE Map>
 <!-- Minimal testcase for bug #1523. -->
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">600, 300</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/text-bug1820+1.xml b/tests/visual_tests/styles/text-bug1820+1.xml
index 563516ad8..22088cc98 100644
--- a/tests/visual_tests/styles/text-bug1820+1.xml
+++ b/tests/visual_tests/styles/text-bug1820+1.xml
@@ -2,10 +2,14 @@
 <!DOCTYPE Map>
 <!-- Minimal testcase for bug #1523. -->
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">600, 300</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/text-bug1820-1.xml b/tests/visual_tests/styles/text-bug1820-1.xml
index ec4984fb2..c65002cea 100644
--- a/tests/visual_tests/styles/text-bug1820-1.xml
+++ b/tests/visual_tests/styles/text-bug1820-1.xml
@@ -2,10 +2,14 @@
 <!DOCTYPE Map>
 <!-- Minimal testcase for bug #1523. -->
 <Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <Parameters>
+        <Parameter name="sizes">600, 300</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
             <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
diff --git a/tests/visual_tests/styles/text-bug2037.xml b/tests/visual_tests/styles/text-bug2037.xml
index c960137ad..9d2cec01c 100644
--- a/tests/visual_tests/styles/text-bug2037.xml
+++ b/tests/visual_tests/styles/text-bug2037.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 300</Parameter>
+    </Parameters>
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
                 <Parameter name="type">csv</Parameter>
+                <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
                 <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
@@ -27,4 +31,4 @@
         </Rule>
 
     </Style>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/text-charplacement.xml b/tests/visual_tests/styles/text-charplacement.xml
index 5a8a705c4..3eb09d16c 100644
--- a/tests/visual_tests/styles/text-charplacement.xml
+++ b/tests/visual_tests/styles/text-charplacement.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgb(255,100,100)">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Style name="road">
         <Rule>
             <LineSymbolizer stroke="rgb(255,255,255)" stroke-opacity="0.7"/>
diff --git a/tests/visual_tests/styles/text-data-binding.xml b/tests/visual_tests/styles/text-data-binding.xml
index fa3b26ab2..5a4253b9b 100644
--- a/tests/visual_tests/styles/text-data-binding.xml
+++ b/tests/visual_tests/styles/text-data-binding.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">500, 500</Parameter>
+    </Parameters>
 
     <Layer name="l1" srs="+proj=latlong +datum=WGS84">
         <StyleName>text</StyleName>
diff --git a/tests/visual_tests/styles/text-displacement.xml b/tests/visual_tests/styles/text-displacement.xml
index 0a63dd89e..9f6a3679b 100644
--- a/tests/visual_tests/styles/text-displacement.xml
+++ b/tests/visual_tests/styles/text-displacement.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgb(255,100,100)">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Style name="road">
         <Rule>
             <LineSymbolizer stroke="rgb(255,255,255)" />
diff --git a/tests/visual_tests/styles/text-expressionformat-color.xml b/tests/visual_tests/styles/text-expressionformat-color.xml
index 2eec041e9..63befbf7d 100644
--- a/tests/visual_tests/styles/text-expressionformat-color.xml
+++ b/tests/visual_tests/styles/text-expressionformat-color.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="orange" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <Parameters>
+    <Parameter name="sizes">800, 100</Parameter>
+  </Parameters>
 
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
       <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
diff --git a/tests/visual_tests/styles/text-font-features.xml b/tests/visual_tests/styles/text-font-features.xml
index bc83c25c3..e09f89894 100644
--- a/tests/visual_tests/styles/text-font-features.xml
+++ b/tests/visual_tests/styles/text-font-features.xml
@@ -5,6 +5,9 @@
     <!ENTITY size2 "14">
 ]>
 <Map background-color="white" font-directory="../fonts/glukfonts">
+    <Parameters>
+        <Parameter name="sizes">1100, 1100</Parameter>
+    </Parameters>
     <Layer name="layer">
         <StyleName>My Style</StyleName>
         <Datasource>
diff --git a/tests/visual_tests/styles/text-halign-adjust-multiline.xml b/tests/visual_tests/styles/text-halign-adjust-multiline.xml
index 0654bb1dd..0afef8839 100644
--- a/tests/visual_tests/styles/text-halign-adjust-multiline.xml
+++ b/tests/visual_tests/styles/text-halign-adjust-multiline.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/text-halign-adjust.xml b/tests/visual_tests/styles/text-halign-adjust.xml
index 039f760bd..13b4020a1 100644
--- a/tests/visual_tests/styles/text-halign-adjust.xml
+++ b/tests/visual_tests/styles/text-halign-adjust.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/text-halign.xml b/tests/visual_tests/styles/text-halign.xml
index d0e67dd20..668f12eee 100644
--- a/tests/visual_tests/styles/text-halign.xml
+++ b/tests/visual_tests/styles/text-halign.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/text-halo-opacity.xml b/tests/visual_tests/styles/text-halo-opacity.xml
index d8cca1932..f9a7127fa 100644
--- a/tests/visual_tests/styles/text-halo-opacity.xml
+++ b/tests/visual_tests/styles/text-halo-opacity.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="steelblue" minimum-version="3.0.0">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
 
     <Style name="labels">
         <Rule>
diff --git a/tests/visual_tests/styles/text-halo-rasterizer.xml b/tests/visual_tests/styles/text-halo-rasterizer.xml
index cefcadb02..c014fe8c7 100644
--- a/tests/visual_tests/styles/text-halo-rasterizer.xml
+++ b/tests/visual_tests/styles/text-halo-rasterizer.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="steelblue" minimum-version="0.7.2">
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
 
     <Style name="labels">
         <Rule>
@@ -221,4 +224,4 @@ x,y
         </Datasource>
     </Layer>
     
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/text-halo-transform.xml b/tests/visual_tests/styles/text-halo-transform.xml
index bcbbdd470..c7493bb4e 100644
--- a/tests/visual_tests/styles/text-halo-transform.xml
+++ b/tests/visual_tests/styles/text-halo-transform.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="steelblue" minimum-version="0.7.2">
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
 
     <Style name="labels">
         <Rule>
@@ -237,4 +240,4 @@ x,y
         </Datasource>
     </Layer>
     
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/text-iconic-font.xml b/tests/visual_tests/styles/text-iconic-font.xml
index 32352d0e4..5b025ee07 100644
--- a/tests/visual_tests/styles/text-iconic-font.xml
+++ b/tests/visual_tests/styles/text-iconic-font.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="white" font-directory="../fonts/Awesome">
+    <Parameters>
+        <Parameter name="sizes">1000, 1000</Parameter>
+    </Parameters>
     <Layer name="layer">
         <StyleName>My Style</StyleName>
         <Datasource>
diff --git a/tests/visual_tests/styles/text-line-wrap.xml b/tests/visual_tests/styles/text-line-wrap.xml
index bb0f8743d..ab47aecdc 100644
--- a/tests/visual_tests/styles/text-line-wrap.xml
+++ b/tests/visual_tests/styles/text-line-wrap.xml
@@ -1,5 +1,8 @@
 <!DOCTYPE Map>
 <Map background-color="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="0.7.2">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Style name="1">
         <Rule>
             <TextSymbolizer
@@ -12,7 +15,7 @@
                 wrap-character="[wrap-character]"
                 halo-radius="1">[label]</TextSymbolizer>
             <PointSymbolizer allow-overlap="true" />
-        </Rule>        
+        </Rule>
     </Style>
 
     <Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
@@ -22,10 +25,10 @@
 
             {
                 "type": "FeatureCollection",
-                            
+
                 "features": [
-                
-                    { "type": "Feature", 
+
+                    { "type": "Feature",
                         "properties": {
                             "label": "this,that",
                             "wrap-character":",",
@@ -33,7 +36,7 @@
                         },
                         "geometry"  : { "type": "Point", "coordinates": [ 2.5, 2.5 ] }
                     },
-                    { "type": "Feature", 
+                    { "type": "Feature",
                         "properties": {
                             "label": "this-that",
                             "wrap-character":"-",
@@ -43,7 +46,7 @@
                     }
                 ]
             }
-            
+
             </Parameter>
             <Parameter name="type">geojson</Parameter>
         </Datasource>
@@ -71,4 +74,4 @@ x,y
         </Datasource>
     </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/text-malayalam.xml b/tests/visual_tests/styles/text-malayalam.xml
index 48b24c955..689f884ac 100644
--- a/tests/visual_tests/styles/text-malayalam.xml
+++ b/tests/visual_tests/styles/text-malayalam.xml
@@ -2,13 +2,16 @@
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84"
      font-directory="../fonts/Rachana/">
+    <Parameters>
+        <Parameter name="sizes">800, 100</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
 	    <StyleName>My Style</StyleName>
 	    <Datasource>
     		<Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-0.05, -0.01, 0.95, 0.01</Parameter>
     		<Parameter name="file">../data/points.csv</Parameter>
-            <Parameter name="extent">-1,-1,1,1</Parameter>
 	    </Datasource>
     </Layer>
     <Style name="My Style">
diff --git a/tests/visual_tests/styles/text-multi-layout-1.xml b/tests/visual_tests/styles/text-multi-layout-1.xml
index 46cb7db7c..a3341fbd2 100644
--- a/tests/visual_tests/styles/text-multi-layout-1.xml
+++ b/tests/visual_tests/styles/text-multi-layout-1.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
+  <Parameters>
+    <Parameter name="sizes">512, 512</Parameter>
+  </Parameters>
 
   <Layer name="obstacle" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>obstacle</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-1,-1,1,1</Parameter>
       <Parameter name="inline">
 lat,long,nr
 -0.5,0.5,0
diff --git a/tests/visual_tests/styles/text-multi-layout-2.xml b/tests/visual_tests/styles/text-multi-layout-2.xml
index 513dd729b..156f09990 100644
--- a/tests/visual_tests/styles/text-multi-layout-2.xml
+++ b/tests/visual_tests/styles/text-multi-layout-2.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">
-    
+  <Parameters>
+    <Parameter name="sizes">512, 512</Parameter>
+  </Parameters>
+
   <Layer name="layer1" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>points</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
+      <Parameter name="extent">-1,-1,1,1</Parameter>
       <Parameter name="inline">
 lat,long
 0,0
       </Parameter>
     </Datasource>
   </Layer>
-  
+
   <Style name="points">
     <Rule>
       <PointSymbolizer allow-overlap="true" ignore-placement="true" file="../../data/raster/white-alpha.png"/>
diff --git a/tests/visual_tests/styles/text-overlap.xml b/tests/visual_tests/styles/text-overlap.xml
index 08ad67556..db1859e38 100644
--- a/tests/visual_tests/styles/text-overlap.xml
+++ b/tests/visual_tests/styles/text-overlap.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgb(255,100,100)">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Style name="road">
         <Rule>
             <LineSymbolizer stroke="rgb(255,255,255)" stroke-width="12" stroke-opacity="0.7"/>
diff --git a/tests/visual_tests/styles/text-spacing.xml b/tests/visual_tests/styles/text-spacing.xml
index 265f80fb6..6f4527962 100644
--- a/tests/visual_tests/styles/text-spacing.xml
+++ b/tests/visual_tests/styles/text-spacing.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="rgb(255,100,100)">
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Style name="road">
         <Rule>
             <LineSymbolizer stroke="rgb(255,255,255)" stroke-width="12" stroke-linejoin="round" stroke-linecap="round"/>
diff --git a/tests/visual_tests/styles/text-ttc-font.xml b/tests/visual_tests/styles/text-ttc-font.xml
index 98f36b845..693aacaf5 100644
--- a/tests/visual_tests/styles/text-ttc-font.xml
+++ b/tests/visual_tests/styles/text-ttc-font.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="steelblue" font-directory="../../data/fonts/NotoSans-Regular.ttc">
+    <Parameters>
+        <Parameter name="sizes">600,400</Parameter>
+    </Parameters>
 
     <Style name="labels">
         <Rule>
@@ -54,7 +57,7 @@ id,x,y
             </Parameter>
         </Datasource>
     </Layer>
-    
+
     <!-- points to frame data view -->
 
     <Style name="frame">
@@ -77,4 +80,4 @@ x,y
         </Datasource>
     </Layer>
     
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/text-typographic.xml b/tests/visual_tests/styles/text-typographic.xml
index 7ef23d759..912d20238 100644
--- a/tests/visual_tests/styles/text-typographic.xml
+++ b/tests/visual_tests/styles/text-typographic.xml
@@ -1,4 +1,7 @@
 <Map>
+    <Parameters>
+        <Parameter name="sizes">512,512</Parameter>
+    </Parameters>
     <Style name="lines" filter-mode="first">
         <Rule>
             <Filter>[id]=1</Filter>
@@ -76,4 +79,4 @@ id,wkt
             </Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/text-vertical-alignment.xml b/tests/visual_tests/styles/text-vertical-alignment.xml
index b980105b6..df8bc12a4 100644
--- a/tests/visual_tests/styles/text-vertical-alignment.xml
+++ b/tests/visual_tests/styles/text-vertical-alignment.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE Map>
 <!-- Upright test -->
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Parameters>
+        <Parameter name="sizes">800, 800</Parameter>
+        <Parameter name="bbox">-0.05, -0.01, 0.95, 0.01</Parameter>
+    </Parameters>
 
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
diff --git a/tests/visual_tests/styles/tiff-alpha-broken-assoc-alpha-gdal.xml b/tests/visual_tests/styles/tiff-alpha-broken-assoc-alpha-gdal.xml
index 6dae4a4ef..128fb05a5 100644
--- a/tests/visual_tests/styles/tiff-alpha-broken-assoc-alpha-gdal.xml
+++ b/tests/visual_tests/styles/tiff-alpha-broken-assoc-alpha-gdal.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="red">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 
 <Style name="white">
   <Rule>
@@ -12,10 +15,10 @@
     <StyleName>white</StyleName>
     <Datasource>
        <!-- tiffinfo data/raster/white-alpha-assoc-alpha-wrong.tiff reports 'Extra Samples: 1<assoc-alpha>' which is incorrect --> 
-       <!-- https://github.com/mapnik/mapnik/issues/1511 --> 
+       <!-- https://github.com/mapnik/mapnik/issues/1511 -->
        <Parameter name="file">../../data/raster/white-alpha-assoc-alpha-wrong.tiff</Parameter>
        <Parameter name="type">gdal</Parameter>
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-alpha-broken-assoc-alpha-raster.xml b/tests/visual_tests/styles/tiff-alpha-broken-assoc-alpha-raster.xml
index c759ff059..2059b5da1 100644
--- a/tests/visual_tests/styles/tiff-alpha-broken-assoc-alpha-raster.xml
+++ b/tests/visual_tests/styles/tiff-alpha-broken-assoc-alpha-raster.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="red">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+    <Parameter name="status">off</Parameter>
+  </Parameters>
 
 <Style name="white">
   <Rule>
@@ -19,4 +23,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-alpha-gdal.xml b/tests/visual_tests/styles/tiff-alpha-gdal.xml
index ce42b1a3f..ec4694331 100644
--- a/tests/visual_tests/styles/tiff-alpha-gdal.xml
+++ b/tests/visual_tests/styles/tiff-alpha-gdal.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="red">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 
 <Style name="white">
   <Rule>
@@ -16,4 +19,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-alpha-gradient-gdal.xml b/tests/visual_tests/styles/tiff-alpha-gradient-gdal.xml
index 7730bba4d..cc5bb5c23 100644
--- a/tests/visual_tests/styles/tiff-alpha-gradient-gdal.xml
+++ b/tests/visual_tests/styles/tiff-alpha-gradient-gdal.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="blue">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 
 <Style name="transp">
   <Rule>
@@ -16,4 +19,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-alpha-gradient-raster.xml b/tests/visual_tests/styles/tiff-alpha-gradient-raster.xml
index 485a5fc1f..2fa8f9724 100644
--- a/tests/visual_tests/styles/tiff-alpha-gradient-raster.xml
+++ b/tests/visual_tests/styles/tiff-alpha-gradient-raster.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="blue">
+  <Parameters>
+    <Parameter name="sizes">256,256</Parameter>
+    <Parameter name="status">off</Parameter>
+  </Parameters>
 
 <Style name="transp">
   <Rule>
@@ -17,4 +21,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-alpha-raster.xml b/tests/visual_tests/styles/tiff-alpha-raster.xml
index a86c7603d..33f7a11d7 100644
--- a/tests/visual_tests/styles/tiff-alpha-raster.xml
+++ b/tests/visual_tests/styles/tiff-alpha-raster.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="red">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+    <Parameter name="status">off</Parameter>
+  </Parameters>
 
 <Style name="white">
   <Rule>
@@ -17,4 +21,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-edge-alignment-gdal1.xml b/tests/visual_tests/styles/tiff-edge-alignment-gdal1.xml
index 0c18e088f..8d45e2b33 100644
--- a/tests/visual_tests/styles/tiff-edge-alignment-gdal1.xml
+++ b/tests/visual_tests/styles/tiff-edge-alignment-gdal1.xml
@@ -1,4 +1,8 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="white">
+  <Parameters>
+    <Parameter name="sizes">256,256; 255,257</Parameter>
+    <Parameter name="bbox">-13267022.12540147,4618019.500877209,-13247454.246160466,4637587.380118214</Parameter>
+  </Parameters>
 
 <Style name="test">
   <Rule>
@@ -14,4 +18,4 @@
     </Datasource>
 </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-edge-alignment-gdal2.xml b/tests/visual_tests/styles/tiff-edge-alignment-gdal2.xml
index 0c18e088f..9299c651a 100644
--- a/tests/visual_tests/styles/tiff-edge-alignment-gdal2.xml
+++ b/tests/visual_tests/styles/tiff-edge-alignment-gdal2.xml
@@ -1,4 +1,8 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="white">
+  <Parameters>
+    <Parameter name="sizes">256,256; 255,257</Parameter>
+    <Parameter name="bbox">-13267022.12540147,4598451.621636203,-13247454.246160466,4618019.500877209</Parameter>
+  </Parameters>
 
 <Style name="test">
   <Rule>
@@ -14,4 +18,4 @@
     </Datasource>
 </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-nodata-edge-gdal.xml b/tests/visual_tests/styles/tiff-nodata-edge-gdal.xml
index 21ed737b1..ae6b6b9f6 100644
--- a/tests/visual_tests/styles/tiff-nodata-edge-gdal.xml
+++ b/tests/visual_tests/styles/tiff-nodata-edge-gdal.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="#F0CCAC">
+  <Parameters>
+    <Parameter name="sizes">600,400; 969,793</Parameter>
+  </Parameters>
 
 <Style name="style" >
   <Rule>
@@ -17,4 +20,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-nodata-edge-raster.xml b/tests/visual_tests/styles/tiff-nodata-edge-raster.xml
index 8305953de..9babcfd34 100644
--- a/tests/visual_tests/styles/tiff-nodata-edge-raster.xml
+++ b/tests/visual_tests/styles/tiff-nodata-edge-raster.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="#F0CCAC">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+    <Parameter name="status">off</Parameter>
+  </Parameters>
 
 <Style name="style" >
   <Rule>
@@ -19,4 +23,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-nodata-edge-rgba.xml b/tests/visual_tests/styles/tiff-nodata-edge-rgba.xml
index 4d56afb77..49cb546fb 100644
--- a/tests/visual_tests/styles/tiff-nodata-edge-rgba.xml
+++ b/tests/visual_tests/styles/tiff-nodata-edge-rgba.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="steelblue">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 <Style name="heat">
   <Rule>
     <RasterSymbolizer opacity="1" scaling="bilinear"/>
@@ -14,4 +17,4 @@
        <Parameter name="nodata_tolerance">5</Parameter>
     </Datasource>
   </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-nodata-rgb.xml b/tests/visual_tests/styles/tiff-nodata-rgb.xml
index decad10d8..d877fff57 100644
--- a/tests/visual_tests/styles/tiff-nodata-rgb.xml
+++ b/tests/visual_tests/styles/tiff-nodata-rgb.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="steelblue">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 <Style name="heat">
   <Rule>
     <RasterSymbolizer opacity="1" scaling="bilinear"/>
@@ -14,4 +17,4 @@
        <Parameter name="nodata">255</Parameter>
     </Datasource>
   </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-nodata-rgba.xml b/tests/visual_tests/styles/tiff-nodata-rgba.xml
index 80e674e15..87baa122d 100644
--- a/tests/visual_tests/styles/tiff-nodata-rgba.xml
+++ b/tests/visual_tests/styles/tiff-nodata-rgba.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="steelblue">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 <Style name="heat">
   <Rule>
     <RasterSymbolizer opacity="1" scaling="bilinear"/>
@@ -13,4 +16,4 @@
        <Parameter name="type">gdal</Parameter>
     </Datasource>
   </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-nodata-tolerance.xml b/tests/visual_tests/styles/tiff-nodata-tolerance.xml
index 05956a1be..85f05a3d9 100644
--- a/tests/visual_tests/styles/tiff-nodata-tolerance.xml
+++ b/tests/visual_tests/styles/tiff-nodata-tolerance.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="white">
+  <Parameters>
+    <Parameter name="sizes">512,512</Parameter>
+  </Parameters>
 
 <Style name="test">
   <Rule>
@@ -16,4 +19,4 @@
     </Datasource>
 </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-opaque-edge-gdal.xml b/tests/visual_tests/styles/tiff-opaque-edge-gdal.xml
index 336e9f3d0..7e322aeac 100644
--- a/tests/visual_tests/styles/tiff-opaque-edge-gdal.xml
+++ b/tests/visual_tests/styles/tiff-opaque-edge-gdal.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="white">
+  <Parameters>
+    <Parameter name="sizes">256,256; 969,793</Parameter>
+  </Parameters>
 
 <Style name="test">
   <Rule>
@@ -16,4 +19,4 @@
     </Datasource>
 </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-opaque-edge-gdal2.xml b/tests/visual_tests/styles/tiff-opaque-edge-gdal2.xml
index 124849988..d47af67dd 100644
--- a/tests/visual_tests/styles/tiff-opaque-edge-gdal2.xml
+++ b/tests/visual_tests/styles/tiff-opaque-edge-gdal2.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="rgba(255,255,255,1)">
+  <Parameters>
+    <Parameter name="sizes">600,400; 969,793</Parameter>
+  </Parameters>
 <Style name="testmerc" filter-mode="first" >
   <Rule>
     <RasterSymbolizer opacity="1" scaling="bilinear" />
@@ -14,4 +17,4 @@
        <Parameter name="type">gdal</Parameter>
     </Datasource>
   </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-opaque-edge-raster.xml b/tests/visual_tests/styles/tiff-opaque-edge-raster.xml
index 580c8d460..35d9370d4 100644
--- a/tests/visual_tests/styles/tiff-opaque-edge-raster.xml
+++ b/tests/visual_tests/styles/tiff-opaque-edge-raster.xml
@@ -1,4 +1,8 @@
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="white">
+  <Parameters>
+    <Parameter name="sizes">256,256</Parameter>
+    <Parameter name="status">off</Parameter>
+  </Parameters>
 
 <Style name="test">
   <Rule>
@@ -15,4 +19,4 @@
     </Datasource>
 </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-opaque-edge-raster2.xml b/tests/visual_tests/styles/tiff-opaque-edge-raster2.xml
index 948bccfa2..20ad342c4 100644
--- a/tests/visual_tests/styles/tiff-opaque-edge-raster2.xml
+++ b/tests/visual_tests/styles/tiff-opaque-edge-raster2.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="rgba(255,255,255,1)">
+  <Parameters>
+    <Parameter name="sizes">600,400; 969,793</Parameter>
+  </Parameters>
 <Style name="testmerc" filter-mode="first" >
   <Rule>
     <RasterSymbolizer opacity="1" scaling="bilinear" />
@@ -15,4 +18,4 @@
        <Parameter name="type">raster</Parameter>
     </Datasource>
   </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-reprojection-1.xml b/tests/visual_tests/styles/tiff-reprojection-1.xml
index 66519f990..004f1756a 100644
--- a/tests/visual_tests/styles/tiff-reprojection-1.xml
+++ b/tests/visual_tests/styles/tiff-reprojection-1.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="#b8dee6" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="sizes">250, 250</Parameter>
+  </Parameters>
 <Style name="heat" filter-mode="first" >
   <Rule>
     <RasterSymbolizer opacity="1" scaling="bilinear"/>
@@ -12,4 +15,4 @@
        <Parameter name="type">gdal</Parameter>
     </Datasource>
   </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-reprojection-2.xml b/tests/visual_tests/styles/tiff-reprojection-2.xml
index 0c3520c39..5a90d9bfd 100644
--- a/tests/visual_tests/styles/tiff-reprojection-2.xml
+++ b/tests/visual_tests/styles/tiff-reprojection-2.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="#b8dee6" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="sizes">250,250</Parameter>
+    <Parameter name="status">off</Parameter>
+  </Parameters>
 
 <Style name="samp1" filter-mode="first">
   <Rule>
@@ -16,4 +20,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff-resampling.xml b/tests/visual_tests/styles/tiff-resampling.xml
index 7dfefaf65..9fe66cb87 100644
--- a/tests/visual_tests/styles/tiff-resampling.xml
+++ b/tests/visual_tests/styles/tiff-resampling.xml
@@ -1,4 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="#ffffff">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 
 <Style name="style">
   <Rule>
@@ -15,4 +18,4 @@
     </Datasource>
   </Layer>
 
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff_colortable.xml b/tests/visual_tests/styles/tiff_colortable.xml
index daf2aa471..f6da4928d 100644
--- a/tests/visual_tests/styles/tiff_colortable.xml
+++ b/tests/visual_tests/styles/tiff_colortable.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Map srs="+init=epsg:32630" background-color="steelblue">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
     <Style name="2011_5km_vrt_nodata_style">
         <Rule>
             <RasterSymbolizer/>
@@ -12,4 +15,4 @@
             <Parameter name="type">gdal</Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/tiff_colortable_custom_nodata.xml b/tests/visual_tests/styles/tiff_colortable_custom_nodata.xml
index f663d7545..eb30b12b7 100644
--- a/tests/visual_tests/styles/tiff_colortable_custom_nodata.xml
+++ b/tests/visual_tests/styles/tiff_colortable_custom_nodata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Map srs="+init=epsg:32630" background-color="steelblue">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
     <Style name="2011_5km_vrt_nodata_style">
         <Rule>
             <RasterSymbolizer/>
@@ -13,4 +16,4 @@
             <Parameter name="type">gdal</Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/vrt_colortable.xml b/tests/visual_tests/styles/vrt_colortable.xml
index f51088343..4897a0a66 100644
--- a/tests/visual_tests/styles/vrt_colortable.xml
+++ b/tests/visual_tests/styles/vrt_colortable.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Map srs="+init=epsg:32630" background-color="rgb(255,255,255)">
+    <Parameters>
+        <Parameter name="sizes">256,256</Parameter>
+    </Parameters>
     <Style name="2011_5km_vrt_nodata_style">
         <Rule>
             <RasterSymbolizer/>
@@ -12,4 +15,4 @@
             <Parameter name="type">gdal</Parameter>
         </Datasource>
     </Layer>
-</Map>
\ No newline at end of file
+</Map>
diff --git a/tests/visual_tests/styles/whole-centroid.xml b/tests/visual_tests/styles/whole-centroid.xml
index ed692a882..d87c01d2f 100644
--- a/tests/visual_tests/styles/whole-centroid.xml
+++ b/tests/visual_tests/styles/whole-centroid.xml
@@ -1,4 +1,7 @@
 <Map maximum-extent="736908, 4390316, 2060771, 5942346">
+  <Parameters>
+    <Parameter name="sizes">600,400</Parameter>
+  </Parameters>
 <Style name="whole">
   <Rule>
     <MarkersSymbolizer placement="point" multi-policy="whole" fill="yellow" width="20" allow-overlap="true"/>
@@ -14,6 +17,7 @@
     <StyleName>whole</StyleName>
     <Datasource>
        <Parameter name="type">csv</Parameter>
+       <Parameter name="extent">736908, 4390316, 2060771, 5942346</Parameter>
        <Parameter name="file">../data/whole-centroid.csv</Parameter>
        <Parameter name="separator">|</Parameter>
     </Datasource>
diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py
index 94451acd0..1fac0645e 100755
--- a/tests/visual_tests/test.py
+++ b/tests/visual_tests/test.py
@@ -9,6 +9,7 @@ import shutil
 import os.path
 from compare import compare, compare_grids
 import platform
+import glob
 
 try:
     import json
@@ -18,6 +19,7 @@ except ImportError:
 visual_output_dir = "/tmp/mapnik-visual-images"
 
 defaults = {
+    'status': True,
     'sizes': [(500, 100)],
     'scales':[1.0,2.0],
     'agg': True,
@@ -76,231 +78,8 @@ renderers = [
     }
 ]
 
-sizes_many_in_big_range = [(800, 100), (600, 100), (400, 100),
-    (300, 100), (250, 100), (150, 100), (100, 100)]
-
-sizes_few_square = [(800, 800), (600, 600), (400, 400), (200, 200)]
-sizes_many_in_small_range = [(490, 100), (495, 100), (497, 100), (498, 100),
-    (499, 100), (500, 100), (501, 100), (502, 100), (505, 100), (510, 100)]
-
-default_text_box = mapnik.Box2d(-0.05, -0.01, 0.95, 0.01)
-large_text_box = mapnik.Box2d(-0.5, -0.5, 0.5, 0.5)
-
-merc_z1_bboxes = {
-  '0,0':mapnik.Box2d(-20037508.342,0,0,20037508.342), # upper left
-  '1,0':mapnik.Box2d(0,0,20037508.342,20037508.342), # upper right
-  '0,1':mapnik.Box2d(-20037508.342,-20037508.342,0,0), # lower left
-  '1,1':mapnik.Box2d(0,-20037508.342,20037508.342,0) # lower right
-}
-
 dirname = os.path.dirname(__file__)
 
-files = {
-    'list': {'sizes': sizes_many_in_big_range,'bbox':default_text_box},
-    'simple': {'sizes': sizes_many_in_big_range,'bbox':default_text_box},
-    'lines-1': {'sizes': sizes_few_square,'bbox':default_text_box},
-    'lines-2': {'sizes': sizes_few_square,'bbox':default_text_box},
-    'lines-3': {'sizes': sizes_few_square,'bbox':default_text_box},
-    'lines-4': {'sizes': sizes_few_square,'bbox':default_text_box},
-    'lines-5': {'sizes': sizes_few_square,'bbox':default_text_box},
-    'lines-6': {'sizes': sizes_few_square,'bbox':default_text_box},
-    'lines-7': {'sizes': sizes_few_square,'bbox':mapnik.Box2d(-1.2, -1.2, 1.2, 1.2)},
-    'lines-multi-layout-1': {'sizes': [(800,800)],'bbox':default_text_box},
-    'lines-multi-layout-2': {'sizes': [(800,800)],'bbox':mapnik.Box2d(-1.2, -1.2, 1.2, 1.2)},
-    'lines-multi-layout-shield': {'sizes': [(800,800)],'bbox':default_text_box},
-    'lines-shield': {'sizes': sizes_few_square,'bbox':default_text_box},
-    'collision': {'sizes':[(600,400)]},
-    'simple-shield': {'sizes':[(600,400)]},
-    'shield-on-polygon': {'sizes':[(600,400)]},
-    'shield-on-line-spacing-eq-width': {'sizes':[(600,400)]},
-    'geometry-transform-translate': {'sizes':[(200,200)]},
-    'geometry-transform-translate-patterns': {'sizes':[(200,200)]},
-    'geometry-transform-translate-patterns-svg': {'sizes':[(200,200)]},
-    'geometry-transform-scale': {'sizes': [(500, 500)]},
-    'geometry-transform-scale-patterns': {'sizes': [(500, 500)]},
-    'marker-interior-position': {'sizes':[(600,400)]},
-    'marker-svg-opacity':{},
-    'marker-svg-opacity2':{},
-    'marker-svg-empty-g-element':{},
-    'marker-multi-policy': {'sizes':[(600,400)]},
-    'marker-on-line': {'sizes':[(600,400)],
-        'bbox': mapnik.Box2d(-10, 0, 15, 20)},
-    'marker-on-line-and-line-placement': {'sizes':[(600,400)],
-        'bbox': mapnik.Box2d(-10, 0, 15, 20)},
-    'marker-on-line-spacing-eq-width': {'sizes':[(600,400)]},
-    'marker-on-line-spacing-eq-width-overlap': {'sizes':[(600,400)]},
-    'marker_line_placement_on_points':{},
-    'marker-on-line-and-vertex-first-placement':{'sizes':[(600,400)],
-        'bbox': mapnik.Box2d(-1, -1, 11, 4)},
-    'marker-on-line-and-vertex-last-placement':{'sizes':[(600,400)],
-        'bbox': mapnik.Box2d(-1, -1, 11, 4)},
-    'marker-with-background-image-linear-comp-op': {},
-    'marker-with-background-image': {'sizes':[(600,400),(400,600),(257,256)]},
-    'marker-with-background-image-and-hsla-transform': {'sizes':[(600,400),(400,600),(257,256)]},
-    'marker-on-hex-grid': {'sizes':[(600,400),(400,600),(257,256)]},
-    'whole-centroid': {'sizes':[(600,400)],
-        'bbox': mapnik.Box2d(736908, 4390316, 2060771, 5942346)},
-    'text-halo-rasterizer': {'sizes':[(600,400)]},
-    'text-halo-transform': {'sizes':[(600,400)]},
-    'text-ttc-font': {'sizes':[(600,400)]},
-    'simple-E': {'bbox':mapnik.Box2d(-0.05, -0.01, 0.95, 0.01)},
-    'simple-NE': {'bbox':default_text_box},
-    'simple-NW': {'bbox':default_text_box},
-    'simple-N': {'bbox':default_text_box},
-    'simple-SE': {'bbox':default_text_box},
-    'simple-SW': {'bbox':default_text_box},
-    'simple-S': {'bbox':default_text_box},
-    'simple-W': {'bbox':default_text_box},
-    'formatting-1': {'bbox':default_text_box},
-    'formatting-2': {'bbox':default_text_box},
-    'formatting-3': {'bbox':default_text_box},
-    'formatting-4': {'bbox':default_text_box},
-    'formatting-5': {'bbox':default_text_box},
-    'formatting-6': {'bbox':default_text_box},
-    'formatting-7': {'bbox':default_text_box},
-    'formatting-8': {'bbox':default_text_box},
-    'formatting-expr-alignment': {'bbox':large_text_box, 'sizes': [(500, 500)]},
-    'expressionformat': {'bbox':default_text_box},
-    'shieldsymbolizer-1': {'sizes': sizes_many_in_small_range,'bbox':default_text_box},
-    'shieldsymbolizer-2': {'sizes': sizes_many_in_small_range,'bbox':default_text_box},
-    'shieldsymbolizer-3': {'sizes': sizes_many_in_small_range,'bbox':default_text_box},
-    'shieldsymbolizer-4': {'sizes': sizes_many_in_small_range,'bbox':default_text_box},
-    'orientation': {'sizes': [(800, 200)], 'bbox': default_text_box},
-    'harfbuzz': {'sizes': [(800, 200)], 'bbox': default_text_box},
-    'hb-fontsets': {'sizes': [(800, 200)], 'bbox': default_text_box},
-    'khmer': {'sizes': [(800, 200)], 'bbox': default_text_box},
-    'charspacing': {'sizes': [(200, 400)], 'bbox': default_text_box},
-    'charspacing-lines': {'sizes': [(300, 300)], 'bbox': default_text_box},
-    'line_break': {'sizes': [(800, 800)], 'bbox': default_text_box},
-    'rtl-point': {'sizes': [(200, 200)],'bbox':default_text_box},
-    'jalign-auto': {'sizes': [(200, 200)],'bbox':default_text_box},
-    'line-offset': {'sizes':[(900, 250)],'bbox': mapnik.Box2d(-5.192, 50.189, -5.174, 50.195)},
-    'repeat-labels-1': {'sizes': [(750,250)],'bbox':mapnik.Box2d(-12, -4, 12, 4)},
-    'repeat-labels-2': {'sizes': [(750,250)],'bbox':mapnik.Box2d(-12, -4, 12, 4)},
-    'repeat-labels-3': {'sizes': [(750,250)],'bbox':mapnik.Box2d(-12, -4, 12, 4)},
-    'repeat-labels-4': {'sizes': [(750,250)],'bbox':mapnik.Box2d(-12, -4, 12, 4)},
-    'text-bug1532': {'sizes': [(600, 165)]},
-    'text-bug1533': {'sizes': [(600, 600)]},
-    'text-bug1820-1': {'sizes': [(600, 300)], 'bbox': default_text_box},
-    'text-bug1820+0': {'sizes': [(600, 300)], 'bbox': default_text_box},
-    'text-bug1820+1': {'sizes': [(600, 300)], 'bbox': default_text_box},
-    'text-bug2037': {'sizes': [(800, 300)], 'bbox': default_text_box},
-    'text-expressionformat-color': {'sizes': [(800, 100)], 'bbox': default_text_box},
-    'text-halign': {'sizes': [(800,800)], 'bbox': default_text_box},
-    'text-halign-adjust': {'sizes': [(800,800)], 'bbox': default_text_box},
-    'text-halign-adjust-multiline': {'sizes': [(800,800)], 'bbox': default_text_box},
-    'text-vertical-alignment': {'sizes': [(800,800)], 'bbox': default_text_box},
-    'text-malayalam': {'sizes': [(800, 100)], 'bbox': default_text_box},
-    'text-bengali': {'sizes': [(800, 100)], 'bbox': default_text_box},
-    'text-font-features': {'sizes': [(1100, 1100)], 'bbox':mapnik.Box2d(-1, -1, 1, 1)},
-    'text-multi-layout-1': {'sizes': [(512,512)], 'bbox':mapnik.Box2d(-1, -1, 1, 1)},
-    'text-multi-layout-2': {'sizes': [(512,512)], 'bbox':mapnik.Box2d(-1, -1, 1, 1)},
-    'line-pattern-symbolizer': {'sizes':[(900, 250)],'bbox': mapnik.Box2d(-5.192, 50.189, -5.174, 50.195)},
-    'tiff-alpha-gdal': {'sizes':[(600,400)]},
-    'tiff-alpha-broken-assoc-alpha-gdal': {'sizes':[(600,400)]},
-    'tiff-alpha-gradient-gdal': {'sizes':[(600,400)]},
-    'tiff-nodata-edge-gdal': {'sizes':[(600,400),(969,793)]},
-    'tiff-opaque-edge-gdal': {'sizes':[(256,256),(969,793)]},
-    'tiff-opaque-edge-gdal2': {'sizes':[(600,400),(969,793)]},
-    'tiff-opaque-edge-raster2': {'sizes':[(600,400),(969,793)]},
-    'tiff-resampling': {'sizes':[(600,400)]},
-    'gdal-filter-factor': {'sizes':[(600,400)]},
-    # https://github.com/mapnik/mapnik/issues/1622
-    'tiff-edge-alignment-gdal1': {'sizes':[(256,256),(255,257)],
-        'bbox':mapnik.Box2d(-13267022.12540147,4618019.500877209,-13247454.246160466,4637587.380118214)
-    },
-    'tiff-edge-alignment-gdal2': {'sizes':[(256,256),(255,257)],
-        'bbox':mapnik.Box2d(-13267022.12540147,4598451.621636203,-13247454.246160466,4618019.500877209)
-    },
-    'tiff-reprojection-1': {'sizes':[(250,250)]},
-    # https://github.com/mapnik/mapnik/issues/1520
-    # commented because these are not critical failures
-    #'tiff-alpha-raster': {'sizes':[(600,400)]},
-    #'tiff-alpha-broken-assoc-alpha-raster': {'sizes':[(600,400)]},
-    #'tiff-nodata-edge-raster': {'sizes':[(600,400)]},
-    #'tiff-opaque-edge-raster': {'sizes':[(256,256)]},
-    # https://github.com/mapnik/mapnik/issues/2438
-    #'tiff-reprojection-2': {'sizes':[(250,250)]},
-    'road-casings-grouped-rendering': {'sizes':[(600,600)],
-        'bbox':mapnik.Box2d(1477001.12245,6890242.37746,1480004.49012,6892244.62256)
-    },
-    'road-casings-non-grouped-rendering': {'sizes':[(600,600)],
-        'bbox':mapnik.Box2d(1477001.12245,6890242.37746,1480004.49012,6892244.62256)
-    },
-    'style-level-compositing-tiled-0,0':{'sizes':[(512,512)],'bbox':merc_z1_bboxes['0,0']},
-    'style-level-compositing-tiled-1,0':{'sizes':[(512,512)],'bbox':merc_z1_bboxes['1,0']},
-    'style-level-compositing-tiled-0,1':{'sizes':[(512,512)],'bbox':merc_z1_bboxes['0,1']},
-    'style-level-compositing-tiled-1,1':{'sizes':[(512,512)],'bbox':merc_z1_bboxes['1,1']},
-    'marker-path-expression':{},
-    'map-background-image-compositing':{'sizes':[(512,512)]},
-    'building-symbolizer-opacity':{'sizes':[(512,512)]},
-    'line-pattern-symbolizer-opacity':{'sizes':[(512,512)]},
-    'dst-over-compositing':{'sizes':[(512,512)]},
-    'tiff_colortable':{'sizes':[(256,256)]},
-    'tiff_colortable_custom_nodata':{'sizes':[(256,256)]},
-    'vrt_colortable':{'sizes':[(256,256)]},
-    'raster_colorizer':{'sizes':[(512,512)]},
-    'raster_symbolizer':{'sizes':[(512,512)]},
-    'raster-color-to-alpha1':{'sizes':[(512,512)]},
-    'raster-color-to-alpha2':{'sizes':[(512,512)]},
-    'raster-color-to-alpha3':{'sizes':[(512,512)]},
-    'raster-color-to-alpha4':{'sizes':[(512,512)]},
-    'raster-color-to-alpha5':{'sizes':[(512,512)]},
-    'colorize-alpha1':{'sizes':[(512,512)]},
-    'colorize-alpha2':{'sizes':[(512,512)]},
-    'colorize-alpha3':{'sizes':[(512,512)]},
-    'image-filters-galore':{'sizes':[(512,512)]},
-    'image-filters-multi-blur':{'sizes':[(512,512)]},
-    'image-filters-multi-blur-inflate':{'sizes':[(512,512)]},
-    'line-opacity-multi-render':{'sizes':[(512,512)]},
-    'tiff-nodata-rgb':{'sizes':[(512,512)]},
-    'tiff-nodata-rgba':{'sizes':[(512,512)]},
-    'tiff-nodata-tolerance':{'sizes':[(512,512)]},
-    'tiff-nodata-edge-rgba':{'sizes':[(512,512)]},
-    'marker-vs-point':{'sizes':[(512,512)]},
-    'line-symbolizer-expressions':{'sizes':[(256,256)]},
-    'line-symbolizer-expressions-all':{'sizes':[(256,256)]},
-    'point-symbolizer-expressions':{'sizes':[(256,256)]},
-    'point-symbolizer-expressions-all':{'sizes':[(256,256)]},
-    'point-symbolizer-overlap-placement-expr': {'bbox':large_text_box, 'sizes': [(500, 500)]},
-    'text-allow-overlap-expr': {'bbox':large_text_box, 'sizes': [(500, 500)]},
-    'marker-symbolizer-expressions-all':{'sizes':[(256,256)]},
-    'polygon-symbolizer-expressions':{'sizes':[(256,256)]},
-    'polygon-symbolizer-expressions-all':{'sizes':[(256,256)]},
-    'polygon-winding-order': {'sizes':[(300,300)]},
-    'group-symbolizer-1':{'sizes':[(512,512)]},
-    'group-symbolizer-2':{'sizes':[(512,512)]},
-    'group-symbolizer-3':{'sizes':[(512,256)]},
-    'group-symbolizer-line-1':{'sizes':[(512,512)]},
-    'group-symbolizer-line-2':{'sizes':[(512,512)]},
-    'text-charplacement':{'sizes':[(512,512)]},
-    'text-displacement':{'sizes':[(512,512)]},
-    'text-overlap':{'sizes':[(512,512)]},
-    'text-spacing':{'sizes':[(512,512)]},
-    'text-halo-opacity':{'sizes':[(512,512)]},
-    # https://github.com/mapnik/mapnik/issues/2202
-    'line-smooth-and-offset':{'sizes':[(512,512)]},
-    'line-pattern-smooth-and-offset':{'sizes':[(512,512)]},
-    'halo-comp-op-on-satellite':{'sizes':[(450,450)]},
-    'marker-whole-multi-polygon':{'sizes':[(512,512)]},
-    'shield-on-line-and-avoid-edges':{'sizes':[(512,512)]},
-    'marker-on-line-and-avoid-edges':{'sizes':[(512,512)]},
-    'text-typographic':{'sizes':[(512,512)]},
-    'functional-expressions':{'sizes':[(256,256)], 'bbox':mapnik.Box2d(-10,-10,10,10)},
-    'functional-expressions-length':{'sizes':[(512,512)], 'bbox':mapnik.Box2d(-15,-15,15,15)},
-    'marker-collide':{'sizes':[(512,512)]},
-    'marker-recenter-collide':{'sizes':[(256,128)], 'bbox':mapnik.Box2d(-1,-0.5,1,0.5)},
-    'postgis-inline':{'sizes':[(512,512)]},
-    'text-line-wrap':{'sizes':[(512,512)]},
-    'text-data-binding': {'sizes': [(500, 500)]},
-    'simplify-radial-distance': {'sizes': [(500, 1000)]},
-    'simplify-zhao-saalfeld': {'sizes': [(500, 1000)]},
-    'simplify-visvalingam-whyatt': {'sizes': [(500, 1000)]},
-    'simplify-douglas-peucker': {'sizes': [(500, 1000)]},
-    'marker-line-placement-many-vertices': {'sizes': [(600, 400)]},
-    'text-iconic-font': {'sizes': [(1000, 1000)]},
-    }
-
 class Reporting:
     DIFF = 1
     NOT_FOUND = 2
@@ -423,16 +202,14 @@ class Reporting:
             print 'View failures by opening %s' % failures_realpath
         return 1
 
-def render(filename,config, width, height, bbox, scale_factor, reporting):
-    m = mapnik.Map(width, height)
-    postfix = "%s-%d-%d-%s" % (filename, width, height, scale_factor)
+def render(filename, config, scale_factor, reporting):
+    m = mapnik.Map(*config['sizes'][0])
 
     try:
-        mapnik.load_map(m, os.path.join(dirname, "styles", "%s.xml" % filename), True)
-        if bbox is not None:
-            m.zoom_to_box(bbox)
-        else:
-            m.zoom_all()
+        mapnik.load_map(m, os.path.join(dirname, "styles", filename), True)
+
+        if not (m.parameters['status'] if ('status' in m.parameters) else config['status']):
+            return
     except Exception, e:
         if 'Could not create datasource' in str(e) \
            or 'Bad connection' in str(e):
@@ -440,26 +217,41 @@ def render(filename,config, width, height, bbox, scale_factor, reporting):
         reporting.other_error(filename, repr(e))
         return m
 
-    for renderer in renderers:
-        if config.get(renderer['name'], True):
-            expected = os.path.join(dirname, renderer['dir'], '%s-%s-reference.%s' %
-                (postfix, renderer['name'], renderer['filetype']))
-            actual = os.path.join(visual_output_dir, '%s-%s.%s' %
-                (postfix, renderer['name'], renderer['filetype']))
-            if not quiet:
-                print "\"%s\" with %s..." % (postfix, renderer['name']),
-            try:
-                renderer['render'](m, actual, scale_factor)
-                if not os.path.exists(expected):
-                    reporting.not_found(actual, expected)
-                else:
-                    diff = renderer['compare'](actual, expected)
-                    if diff > renderer['threshold']:
-                        reporting.result_fail(actual, expected, diff)
+    sizes = config['sizes'];
+    if 'sizes' in m.parameters:
+        sizes = [[int(i) for i in size.split(',')] for size in m.parameters['sizes'].split(';')]
+
+    for size in sizes:
+        m.width, m.height = size
+
+        if 'bbox' in m.parameters:
+            bbox = mapnik.Box2d.from_string(str(m.parameters['bbox']))
+            m.zoom_to_box(bbox)
+        else:
+            m.zoom_all()
+
+        name = filename[0:-4]
+        postfix = "%s-%d-%d-%s" % (name, m.width, m.height, scale_factor)
+        for renderer in renderers:
+            if config.get(renderer['name'], True):
+                expected = os.path.join(dirname, renderer['dir'], '%s-%s-reference.%s' %
+                    (postfix, renderer['name'], renderer['filetype']))
+                actual = os.path.join(visual_output_dir, '%s-%s.%s' %
+                    (postfix, renderer['name'], renderer['filetype']))
+                if not quiet:
+                    print "\"%s\" with %s..." % (postfix, renderer['name']),
+                try:
+                    renderer['render'](m, actual, scale_factor)
+                    if not os.path.exists(expected):
+                        reporting.not_found(actual, expected)
                     else:
-                        reporting.result_pass(actual, expected, diff)
-            except Exception, e:
-                reporting.other_error(expected, repr(e))
+                        diff = renderer['compare'](actual, expected)
+                        if diff > renderer['threshold']:
+                            reporting.result_fail(actual, expected, diff)
+                        else:
+                            reporting.result_pass(actual, expected, diff)
+                except Exception, e:
+                    reporting.other_error(expected, repr(e))
     return m
 
 if __name__ == "__main__":
@@ -475,15 +267,11 @@ if __name__ == "__main__":
     else:
        overwrite_failures = False
 
-    select_files = {}
+    files = None
     if len(sys.argv) > 1:
-        for name in sys.argv[1:]:
-            if name in files:
-                select_files[name]=files[name]
-            else:
-                select_files[name]={}
-    if len(select_files) > 0:
-        files = select_files
+        files = [name + ".xml" for name in sys.argv[1:]]
+    else:
+        files = [os.path.basename(file) for file in glob.glob(os.path.join(dirname, "styles/*.xml"))]
 
     if not os.path.exists(visual_output_dir):
         os.makedirs(visual_output_dir)
@@ -492,17 +280,9 @@ if __name__ == "__main__":
     try:
         for filename in files:
             config = dict(defaults)
-            config.update(files[filename])
-            for size in config['sizes']:
-                for scale_factor in config['scales']:
-                    m = render(filename,
-                               config,
-                               size[0],
-                               size[1],
-                               config.get('bbox'),
-                               scale_factor,
-                               reporting)
-            #mapnik.save_map(m, os.path.join(dirname, 'xml_output', "%s-out.xml" % filename))
+            for scale_factor in config['scales']:
+                m = render(filename, config, scale_factor, reporting)
+                #mapnik.save_map(m, os.path.join(dirname, 'xml_output', "%s-out.xml" % filename))
     except KeyboardInterrupt:
         pass
     sys.exit(reporting.summary())