diff --git a/tests/visual_tests/data/points.osm b/tests/visual_tests/data/points.osm
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/visual_tests/styles/charspacing.xml b/tests/visual_tests/styles/charspacing.xml
index 481d893f6..3afbdfd66 100644
--- a/tests/visual_tests/styles/charspacing.xml
+++ b/tests/visual_tests/styles/charspacing.xml
@@ -4,13 +4,13 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
-                <Parameter name="type">osm</Parameter>
-                <Parameter name="file">../data/points.osm</Parameter>
+                <Parameter name="type">csv</Parameter>
+                <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
     <Style name="My Style">
         <Rule>
-            <Filter>[nr] = "6"</Filter>
+            <Filter>[nr] = 6</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-90" character-spacing="0.0">"Char spacing 0.0"</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-80" character-spacing="0.1">"Char spacing 0.1"</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-70" character-spacing="0.2">"Char spacing 0.2"</TextSymbolizer>
diff --git a/tests/visual_tests/styles/formatting.xml b/tests/visual_tests/styles/formatting.xml
index e1e293f7d..541d7c1e1 100644
--- a/tests/visual_tests/styles/formatting.xml
+++ b/tests/visual_tests/styles/formatting.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/harfbuzz.xml b/tests/visual_tests/styles/harfbuzz.xml
index 3e4e4869c..66c7bafb0 100644
--- a/tests/visual_tests/styles/harfbuzz.xml
+++ b/tests/visual_tests/styles/harfbuzz.xml
@@ -4,8 +4,8 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
-                <Parameter name="type">osm</Parameter>
-                <Parameter name="file">../data/points.osm</Parameter>
+                <Parameter name="type">csv</Parameter>
+                <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
 
diff --git a/tests/visual_tests/styles/hb-fontsets.xml b/tests/visual_tests/styles/hb-fontsets.xml
index 0ec16cfd6..87808a62e 100644
--- a/tests/visual_tests/styles/hb-fontsets.xml
+++ b/tests/visual_tests/styles/hb-fontsets.xml
@@ -4,8 +4,8 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
-                <Parameter name="type">osm</Parameter>
-                <Parameter name="file">../data/points.osm</Parameter>
+                <Parameter name="type">csv</Parameter>
+                <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
 
diff --git a/tests/visual_tests/styles/khmer.xml b/tests/visual_tests/styles/khmer.xml
index e5a9feaff..4bcf10e33 100644
--- a/tests/visual_tests/styles/khmer.xml
+++ b/tests/visual_tests/styles/khmer.xml
@@ -4,8 +4,8 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
-                <Parameter name="type">osm</Parameter>
-                <Parameter name="file">../data/points.osm</Parameter>
+                <Parameter name="type">csv</Parameter>
+                <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
     <Style name="My Style">
diff --git a/tests/visual_tests/styles/line_break.xml b/tests/visual_tests/styles/line_break.xml
index c9eb2830f..8779e7a1d 100644
--- a/tests/visual_tests/styles/line_break.xml
+++ b/tests/visual_tests/styles/line_break.xml
@@ -4,8 +4,8 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
             <StyleName>My Style</StyleName>
             <Datasource>
-                <Parameter name="type">osm</Parameter>
-                <Parameter name="file">../data/points.osm</Parameter>
+                <Parameter name="type">csv</Parameter>
+                <Parameter name="file">../data/points.csv</Parameter>
             </Datasource>
     </Layer>
 
diff --git a/tests/visual_tests/styles/orientation.xml b/tests/visual_tests/styles/orientation.xml
index fa38daf7f..e0e283b78 100644
--- a/tests/visual_tests/styles/orientation.xml
+++ b/tests/visual_tests/styles/orientation.xml
@@ -5,59 +5,59 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/points.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
-            <Filter>[nr] = '1'</Filter>
+            <Filter>[nr] = 1</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="45">"XYZ"</TextSymbolizer>
             <PointSymbolizer allow-overlap="true"/> 
         </Rule>
         <Rule>
-            <Filter>[nr] = '2'</Filter>
+            <Filter>[nr] = 2</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="90">"XYZ"</TextSymbolizer>
             <PointSymbolizer allow-overlap="true"/>
         </Rule>
         <Rule>
-            <Filter>[nr] = '3'</Filter>
+            <Filter>[nr] = 3</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="180">"XYZ"</TextSymbolizer>
             <PointSymbolizer allow-overlap="true"/>
         </Rule>
         <Rule>
-            <Filter>[nr] = '4'</Filter>
+            <Filter>[nr] = 4</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="45" dy="10">"Line&#10;break"</TextSymbolizer>
             <PointSymbolizer allow-overlap="true"/>
         </Rule>
         <Rule>
-            <Filter>[nr] = '5'</Filter>
+            <Filter>[nr] = 5</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="45" dy="10">"XYZ"</TextSymbolizer>
             <PointSymbolizer allow-overlap="true"/>
         </Rule>
         <Rule>
-            <Filter>[nr] = '6'</Filter>
+            <Filter>[nr] = 6</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="90" dy="10">"XYZ"</TextSymbolizer>
             <PointSymbolizer allow-overlap="true"/>
         </Rule>
         <Rule>
-            <Filter>[nr] = '7'</Filter>
+            <Filter>[nr] = 7</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="180" dy="10">"XYZ"</TextSymbolizer>
             <PointSymbolizer allow-overlap="true"/>
         </Rule>
         <Rule>
-            <Filter>[nr] = '8'</Filter>
+            <Filter>[nr] = 8</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="0" horizontal-alignment="right" vertical-alignment="top" rotate-displacement="true">"XYZ"</TextSymbolizer>
             <PointSymbolizer allow-overlap="true"/>
         </Rule>
         <Rule>
-            <Filter>[nr] = '9'</Filter>
+            <Filter>[nr] = 9</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="90" horizontal-alignment="right" vertical-alignment="top" rotate-displacement="true">"XYZ"</TextSymbolizer>
             <PointSymbolizer allow-overlap="true"/>
         </Rule>
         <Rule>
-            <Filter>[nr] = '10'</Filter>
+            <Filter>[nr] = 10</Filter>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="180" horizontal-alignment="right" vertical-alignment="top" rotate-displacement="true">"XYZ"</TextSymbolizer>
             <PointSymbolizer allow-overlap="true"/>
         </Rule>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-2.xml b/tests/visual_tests/styles/shieldsymbolizer-2.xml
index cee94b527..7acf4276d 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-2.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-2.xml
@@ -6,50 +6,50 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/points.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
-            <Filter>[nr] = '1'</Filter>
+            <Filter>[nr] = 1</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '2'</Filter>
+            <Filter>[nr] = 2</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="middle" dx="5" unlock-image="true">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '3'</Filter>
+            <Filter>[nr] = 3</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5" unlock-image="true">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '4'</Filter>
+            <Filter>[nr] = 4</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg"  dy="0" vertical-alignment="bottom" unlock-image="true">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '5'</Filter>
+            <Filter>[nr] = 5</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" vertical-alignment="top" unlock-image="true">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '6'</Filter>
+            <Filter>[nr] = 6</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="left" unlock-image="true">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '7'</Filter>
+            <Filter>[nr] = 7</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="right" unlock-image="true">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '8'</Filter>
+            <Filter>[nr] = 8</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true">'X&#10;X&#10;X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '9'</Filter>
+            <Filter>[nr] = 9</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true">'XXX'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '10'</Filter>
+            <Filter>[nr] = 10</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/images/crosshair16x16.png" unlock-image="true">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-3.xml b/tests/visual_tests/styles/shieldsymbolizer-3.xml
index c54b82c6e..01e3dc151 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-3.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-3.xml
@@ -6,50 +6,50 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/points.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
-            <Filter>[nr] = '1'</Filter>
+            <Filter>[nr] = 1</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '2'</Filter>
+            <Filter>[nr] = 2</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="middle" dx="5" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '3'</Filter>
+            <Filter>[nr] = 3</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '4'</Filter>
+            <Filter>[nr] = 4</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg"  dy="0" vertical-alignment="bottom" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '5'</Filter>
+            <Filter>[nr] = 5</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" vertical-alignment="top" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '6'</Filter>
+            <Filter>[nr] = 6</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="left" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '7'</Filter>
+            <Filter>[nr] = 7</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="right" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '8'</Filter>
+            <Filter>[nr] = 8</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="false" shield-dx="15">'X&#10;X&#10;X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '9'</Filter>
+            <Filter>[nr] = 9</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="false" shield-dx="15">'XXX'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '10'</Filter>
+            <Filter>[nr] = 10</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/images/crosshair16x16.png" unlock-image="false" shield-dx="15" dy="20">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-4.xml b/tests/visual_tests/styles/shieldsymbolizer-4.xml
index e9e098045..14fe55ebf 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-4.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-4.xml
@@ -6,50 +6,50 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/points.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
-            <Filter>[nr] = '1'</Filter>
+            <Filter>[nr] = 1</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '2'</Filter>
+            <Filter>[nr] = 2</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="middle" dx="5" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '3'</Filter>
+            <Filter>[nr] = 3</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '4'</Filter>
+            <Filter>[nr] = 4</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg"  dy="0" vertical-alignment="bottom" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '5'</Filter>
+            <Filter>[nr] = 5</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" vertical-alignment="top" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '6'</Filter>
+            <Filter>[nr] = 6</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="left" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '7'</Filter>
+            <Filter>[nr] = 7</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="right" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '8'</Filter>
+            <Filter>[nr] = 8</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true" shield-dx="15">'X&#10;X&#10;X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '9'</Filter>
+            <Filter>[nr] = 9</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true" shield-dx="15">'XXX'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '10'</Filter>
+            <Filter>[nr] = 10</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/images/crosshair16x16.png" unlock-image="true" shield-dx="15" dy="20">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
diff --git a/tests/visual_tests/styles/text-bengali.xml b/tests/visual_tests/styles/text-bengali.xml
index 7780dd05d..1aa40b649 100644
--- a/tests/visual_tests/styles/text-bengali.xml
+++ b/tests/visual_tests/styles/text-bengali.xml
@@ -4,8 +4,8 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
 	    <StyleName>My Style</StyleName>
 	    <Datasource>
-		<Parameter name="type">osm</Parameter>
-		<Parameter name="file">../data/points.osm</Parameter>
+		<Parameter name="type">csv</Parameter>
+		<Parameter name="file">../data/points.csv</Parameter>
 	    </Datasource>
     </Layer>
     <Style name="My Style">
diff --git a/tests/visual_tests/styles/text-bug1820+0.xml b/tests/visual_tests/styles/text-bug1820+0.xml
index acf222e24..3477a6d75 100644
--- a/tests/visual_tests/styles/text-bug1820+0.xml
+++ b/tests/visual_tests/styles/text-bug1820+0.xml
@@ -5,8 +5,8 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/points.osm</Parameter>
+            <Parameter name="type">csv</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 10c01d1c2..b59c7d33e 100644
--- a/tests/visual_tests/styles/text-bug1820+1.xml
+++ b/tests/visual_tests/styles/text-bug1820+1.xml
@@ -5,8 +5,8 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/points.osm</Parameter>
+            <Parameter name="type">csv</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 837ccfb2c..bbafe145d 100644
--- a/tests/visual_tests/styles/text-bug1820-1.xml
+++ b/tests/visual_tests/styles/text-bug1820-1.xml
@@ -5,8 +5,8 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/points.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
 
diff --git a/tests/visual_tests/styles/text-expressionformat-color.xml b/tests/visual_tests/styles/text-expressionformat-color.xml
index 3dd9d0fee..7ef679c0f 100644
--- a/tests/visual_tests/styles/text-expressionformat-color.xml
+++ b/tests/visual_tests/styles/text-expressionformat-color.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/text-malayalam.xml b/tests/visual_tests/styles/text-malayalam.xml
index b0f2d0478..b516cb300 100644
--- a/tests/visual_tests/styles/text-malayalam.xml
+++ b/tests/visual_tests/styles/text-malayalam.xml
@@ -4,8 +4,8 @@
     <Layer name="layer" srs="+proj=latlong +datum=WGS84">
 	    <StyleName>My Style</StyleName>
 	    <Datasource>
-		<Parameter name="type">osm</Parameter>
-		<Parameter name="file">../data/points.osm</Parameter>
+		<Parameter name="type">csv</Parameter>
+		<Parameter name="file">../data/points.csv</Parameter>
 	    </Datasource>
     </Layer>
     <Style name="My Style">
diff --git a/tests/visual_tests/test_python.py b/tests/visual_tests/test_python.py
index 00857fbd1..e5418e3c3 100755
--- a/tests/visual_tests/test_python.py
+++ b/tests/visual_tests/test_python.py
@@ -71,7 +71,7 @@ m.append_style('Style', style)
 
 
 layer = mapnik.Layer('Layer')
-layer.datasource = mapnik.Osm(file=os.path.join(dirname,"data/points.osm"))
+layer.datasource = mapnik.Osm(file=os.path.join(dirname,"data/points.csv"))
 layer.styles.append('Style')
 m.layers.append(layer)