diff --git a/tests/visual_tests/images/harfbuzz-800-200-1.0-agg-reference.png b/tests/visual_tests/images/harfbuzz-800-200-1.0-agg-reference.png
index 440a23a8b..738f778e7 100644
Binary files a/tests/visual_tests/images/harfbuzz-800-200-1.0-agg-reference.png and b/tests/visual_tests/images/harfbuzz-800-200-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/harfbuzz-800-200-1.0-cairo-reference.png b/tests/visual_tests/images/harfbuzz-800-200-1.0-cairo-reference.png
index 036ee0817..064a1623a 100644
Binary files a/tests/visual_tests/images/harfbuzz-800-200-1.0-cairo-reference.png and b/tests/visual_tests/images/harfbuzz-800-200-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/harfbuzz-800-200-2.0-agg-reference.png b/tests/visual_tests/images/harfbuzz-800-200-2.0-agg-reference.png
index a71269f58..b6da1f8fa 100644
Binary files a/tests/visual_tests/images/harfbuzz-800-200-2.0-agg-reference.png and b/tests/visual_tests/images/harfbuzz-800-200-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/harfbuzz-800-200-2.0-cairo-reference.png b/tests/visual_tests/images/harfbuzz-800-200-2.0-cairo-reference.png
index 84a6ca438..a9ec907d8 100644
Binary files a/tests/visual_tests/images/harfbuzz-800-200-2.0-cairo-reference.png and b/tests/visual_tests/images/harfbuzz-800-200-2.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/khmer-800-200-1.0-agg-reference.png b/tests/visual_tests/images/khmer-800-200-1.0-agg-reference.png
index 036ee0817..432181d46 100644
Binary files a/tests/visual_tests/images/khmer-800-200-1.0-agg-reference.png and b/tests/visual_tests/images/khmer-800-200-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/khmer-800-200-1.0-cairo-reference.png b/tests/visual_tests/images/khmer-800-200-1.0-cairo-reference.png
index 036ee0817..a5d532c34 100644
Binary files a/tests/visual_tests/images/khmer-800-200-1.0-cairo-reference.png and b/tests/visual_tests/images/khmer-800-200-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png b/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png
index a7b2ef6c1..1977ed355 100644
Binary files a/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png and b/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/khmer-800-200-2.0-cairo-reference.png b/tests/visual_tests/images/khmer-800-200-2.0-cairo-reference.png
index 84a6ca438..1b88b4145 100644
Binary files a/tests/visual_tests/images/khmer-800-200-2.0-cairo-reference.png and b/tests/visual_tests/images/khmer-800-200-2.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/text-bengali-800-100-1.0-agg-reference.png b/tests/visual_tests/images/text-bengali-800-100-1.0-agg-reference.png
index 78956a942..6da014f2e 100644
Binary files a/tests/visual_tests/images/text-bengali-800-100-1.0-agg-reference.png and b/tests/visual_tests/images/text-bengali-800-100-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/text-bengali-800-100-1.0-cairo-reference.png b/tests/visual_tests/images/text-bengali-800-100-1.0-cairo-reference.png
index 78956a942..391af55a2 100644
Binary files a/tests/visual_tests/images/text-bengali-800-100-1.0-cairo-reference.png and b/tests/visual_tests/images/text-bengali-800-100-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png b/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png
index 78956a942..db197517f 100644
Binary files a/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png and b/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/text-bengali-800-100-2.0-cairo-reference.png b/tests/visual_tests/images/text-bengali-800-100-2.0-cairo-reference.png
index 78956a942..8560b271d 100644
Binary files a/tests/visual_tests/images/text-bengali-800-100-2.0-cairo-reference.png and b/tests/visual_tests/images/text-bengali-800-100-2.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/text-malayalam-800-100-1.0-agg-reference.png b/tests/visual_tests/images/text-malayalam-800-100-1.0-agg-reference.png
index 78956a942..447b26053 100644
Binary files a/tests/visual_tests/images/text-malayalam-800-100-1.0-agg-reference.png and b/tests/visual_tests/images/text-malayalam-800-100-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/text-malayalam-800-100-1.0-cairo-reference.png b/tests/visual_tests/images/text-malayalam-800-100-1.0-cairo-reference.png
index 78956a942..447b26053 100644
Binary files a/tests/visual_tests/images/text-malayalam-800-100-1.0-cairo-reference.png and b/tests/visual_tests/images/text-malayalam-800-100-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/text-malayalam-800-100-2.0-agg-reference.png b/tests/visual_tests/images/text-malayalam-800-100-2.0-agg-reference.png
index 78956a942..706a920e4 100644
Binary files a/tests/visual_tests/images/text-malayalam-800-100-2.0-agg-reference.png and b/tests/visual_tests/images/text-malayalam-800-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/text-malayalam-800-100-2.0-cairo-reference.png b/tests/visual_tests/images/text-malayalam-800-100-2.0-cairo-reference.png
index 78956a942..a2783c652 100644
Binary files a/tests/visual_tests/images/text-malayalam-800-100-2.0-cairo-reference.png and b/tests/visual_tests/images/text-malayalam-800-100-2.0-cairo-reference.png differ
diff --git a/tests/visual_tests/styles/harfbuzz.xml b/tests/visual_tests/styles/harfbuzz.xml
index 66c7bafb0..b1b9473b9 100644
--- a/tests/visual_tests/styles/harfbuzz.xml
+++ b/tests/visual_tests/styles/harfbuzz.xml
@@ -6,6 +6,7 @@
             <Datasource>
                 <Parameter name="type">csv</Parameter>
                 <Parameter name="file">../data/points.csv</Parameter>
+                <Parameter name="extent">-1,-1,1,1</Parameter>
             </Datasource>
     </Layer>
 
@@ -16,23 +17,23 @@
         </Rule>
         <Rule>
             <!-- This is an easy test to ensure text shaping actually works. Ligatures are rendered when harfbuzz is used, but not with the old text rendering system. -->
-            <Filter>[nr] = "3"</Filter>
+            <Filter>[nr] = 3</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dy="-16">"Ligature: fi"</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dy="16">"mixed نامجو Text"</TextSymbolizer>
         </Rule>
         <Rule>
             <!-- In addition to the problem mentioned in the bug report (which seems to be gone) this the position is calculated incorrectly -->
-            <Filter>[nr] = "1"</Filter>
+            <Filter>[nr] = 1</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dy="-16">"نامجو 17"</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dy="16">"#519"</TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = "6"</Filter>
+            <Filter>[nr] = 6</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="-16">"زنقة الملاح"</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dy="16">"#1154"</TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = "9"</Filter>
+            <Filter>[nr] = 9</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="-16">"أڭادير"</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dy="16">"#1146"</TextSymbolizer>
         </Rule>
diff --git a/tests/visual_tests/styles/khmer.xml b/tests/visual_tests/styles/khmer.xml
index 5439e101d..4d2eddc24 100644
--- a/tests/visual_tests/styles/khmer.xml
+++ b/tests/visual_tests/styles/khmer.xml
@@ -15,23 +15,23 @@
             <PointSymbolizer/>
         </Rule>
         <Rule>
-            <Filter>[nr] = "1"</Filter>
+            <Filter>[nr] = 1</Filter>
             <TextSymbolizer face-name="Khmer OS Regular" size="20" placement="point" dy="16">"ព្រះរាជាណាចក្រកម្ពុជា"</TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = "3"</Filter>
+            <Filter>[nr] = 3</Filter>
             <TextSymbolizer face-name="Khmer OS Regular" size="20" placement="point" dy="16">"ស្ត្រី"</TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = "5"</Filter>
+            <Filter>[nr] = 5</Filter>
             <TextSymbolizer face-name="Khmer OS Regular" size="20" placement="point" dy="16">"ផ្លូវ ១២៣"</TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = "7"</Filter>
+            <Filter>[nr] = 7</Filter>
             <TextSymbolizer face-name="Khmer OS Regular" size="20" placement="point" dy="-16">"ផផ្ទះសំណាក់​សណ្ឋាគារ​មាស"</TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = "9"</Filter>
+            <Filter>[nr] = 9</Filter>
             <TextSymbolizer face-name="Khmer OS Regular" size="20" placement="point" dy="16">"ផ្លូវ១២៣"</TextSymbolizer>
         </Rule>
     </Style>
diff --git a/tests/visual_tests/styles/text-bengali.xml b/tests/visual_tests/styles/text-bengali.xml
index d6a0abde4..23d5a5b23 100644
--- a/tests/visual_tests/styles/text-bengali.xml
+++ b/tests/visual_tests/styles/text-bengali.xml
@@ -10,21 +10,22 @@
     <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="type">csv</Parameter>
+    		<Parameter name="file">../data/points.csv</Parameter>
+            <Parameter name="extent">-1,-1,1,1</Parameter>
 	    </Datasource>
     </Layer>
     <Style name="My Style">
       <Rule>
-	    <Filter>[nr] = "3"</Filter>
+	    <Filter>[nr] = 3</Filter>
 	    <TextSymbolizer face-name="Lohit Bengali Regular" size="30" placement="point" dy="0">"গোপালগঞ্জ"</TextSymbolizer>
 	</Rule>
 	<Rule>
-	    <Filter>[nr] = "5"</Filter>
+	    <Filter>[nr] = 5</Filter>
 	    <TextSymbolizer face-name="Lohit Bengali Regular" size="30" placement="point" dy="0">"ঝিনাইদহ"</TextSymbolizer>
 	</Rule>
 	<Rule>
-	    <Filter>[nr] = "7"</Filter>
+	    <Filter>[nr] = 7</Filter>
 	    <TextSymbolizer face-name="Lohit Bengali Regular" size="30" placement="point" dy="0">"কুষ্টিয়া"</TextSymbolizer>
 	</Rule>
     </Style>
diff --git a/tests/visual_tests/styles/text-malayalam.xml b/tests/visual_tests/styles/text-malayalam.xml
index a0e760227..48b24c955 100644
--- a/tests/visual_tests/styles/text-malayalam.xml
+++ b/tests/visual_tests/styles/text-malayalam.xml
@@ -6,13 +6,14 @@
     <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="type">csv</Parameter>
+    		<Parameter name="file">../data/points.csv</Parameter>
+            <Parameter name="extent">-1,-1,1,1</Parameter>
 	    </Datasource>
     </Layer>
     <Style name="My Style">
 	<Rule>
-	    <Filter>[nr] = "5"</Filter>
+	    <Filter>[nr] = 5</Filter>
 	    <TextSymbolizer face-name="Rachana Book" size="30" placement="point" dy="0">"ഇന്ത്യ"</TextSymbolizer>
 	</Rule>
     </Style>