diff --git a/tests/visual_tests/data/points.csv b/tests/visual_tests/data/points.csv
new file mode 100644
index 000000000..f895b612f
--- /dev/null
+++ b/tests/visual_tests/data/points.csv
@@ -0,0 +1,11 @@
+lat,long,name,nr
+0,0,Test one,1
+0,0.1,Test two,2
+0,0.2,Test three,3
+0,0.3,Test four,4
+0,0.4,Test five,5
+0,0.5,Test six,6
+0,0.6,Test seven,7
+0,0.7,Test eight,8
+0,0.8,Test nine,9
+0,0.9,Test ten,10
\ No newline at end of file
diff --git a/tests/visual_tests/data/points.osm b/tests/visual_tests/data/points.osm
deleted file mode 100644
index 086f0a479..000000000
--- a/tests/visual_tests/data/points.osm
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
-  <node id='-1' lat='0' lon='0'>
-    <tag k='name' v='Test one' />
-    <tag k='nr' v='1' />
-  </node>
-    <node id='-2' lat='0' lon='0.1'>
-    <tag k='name' v='Test two' />
-    <tag k='nr' v='2' />
-  </node>
-    <node id='-3' lat='0' lon='0.2'>
-    <tag k='name' v='Test three' />
-    <tag k='nr' v='3' />
-  </node>
-    <node id='-4' lat='0' lon='0.3'>
-    <tag k='name' v='Test four' />
-    <tag k='nr' v='4' />
-  </node>
-    <node id='-5' lat='0' lon='0.4'>
-    <tag k='name' v='Test five' />
-    <tag k='nr' v='5' />
-  </node>
-    <node id='-6' lat='0' lon='0.5'>
-    <tag k='name' v='Test six' />
-    <tag k='nr' v='6' />
-  </node>
-    <node id='-7' lat='0' lon='0.6'>
-    <tag k='name' v='Test seven' />
-    <tag k='nr' v='7' />
-  </node>
-      <node id='-8' lat='0' lon='0.7'>
-    <tag k='name' v='Test eight' />
-    <tag k='nr' v='8' />
-  </node>
-   <node id='-9' lat='0' lon='0.8'>
-    <tag k='name' v='Test nine' />
-    <tag k='nr' v='9' />
-  </node>
-   <node id='-10' lat='0' lon='0.9'>
-    <tag k='name' v='Test ten' />
-    <tag k='nr' v='10' />
-  </node>
-</osm>
diff --git a/tests/visual_tests/styles/expressionformat.xml b/tests/visual_tests/styles/expressionformat.xml
index 919430f97..81c7b65c3 100644
--- a/tests/visual_tests/styles/expressionformat.xml
+++ b/tests/visual_tests/styles/expressionformat.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/formatting-1.xml b/tests/visual_tests/styles/formatting-1.xml
index 15f512abf..7bb62f15f 100644
--- a/tests/visual_tests/styles/formatting-1.xml
+++ b/tests/visual_tests/styles/formatting-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/formatting-2.xml b/tests/visual_tests/styles/formatting-2.xml
index 635af6a39..ca7646a47 100644
--- a/tests/visual_tests/styles/formatting-2.xml
+++ b/tests/visual_tests/styles/formatting-2.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/formatting-3.xml b/tests/visual_tests/styles/formatting-3.xml
index 97a5fb1f2..eb9e449fe 100644
--- a/tests/visual_tests/styles/formatting-3.xml
+++ b/tests/visual_tests/styles/formatting-3.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/formatting-4.xml b/tests/visual_tests/styles/formatting-4.xml
index b09f59a26..984a654fb 100644
--- a/tests/visual_tests/styles/formatting-4.xml
+++ b/tests/visual_tests/styles/formatting-4.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/jalign-auto.xml b/tests/visual_tests/styles/jalign-auto.xml
index f59f31cba..2ee79edd5 100644
--- a/tests/visual_tests/styles/jalign-auto.xml
+++ b/tests/visual_tests/styles/jalign-auto.xml
@@ -5,14 +5,14 @@
     <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>
 
     <Style name="My Style">
         <Rule>
-            <Filter>[nr] = '5'</Filter>
+            <Filter>[nr] = 5</Filter>
             <PointSymbolizer/>
             <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>
diff --git a/tests/visual_tests/styles/list.xml b/tests/visual_tests/styles/list.xml
index 61401dd90..50a189bd1 100644
--- a/tests/visual_tests/styles/list.xml
+++ b/tests/visual_tests/styles/list.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/rtl-point.xml b/tests/visual_tests/styles/rtl-point.xml
index ac765b488..5236f94ee 100644
--- a/tests/visual_tests/styles/rtl-point.xml
+++ b/tests/visual_tests/styles/rtl-point.xml
@@ -5,14 +5,14 @@
     <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>
 
     <Style name="My Style">
         <Rule>
-            <Filter>[nr]='5'</Filter>
+            <Filter>[nr]=5</Filter>
             <PointSymbolizer/>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dx="0" dy="16" wrap-width="10">'مخيّم دير البلح'</TextSymbolizer>
         </Rule>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-1.xml b/tests/visual_tests/styles/shieldsymbolizer-1.xml
index 815f22920..cc37000d5 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-1.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-1.xml
@@ -5,50 +5,50 @@
     <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>
 
     <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">'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">'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">'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">'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">'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">'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">'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">'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">'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">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
diff --git a/tests/visual_tests/styles/simple-E.xml b/tests/visual_tests/styles/simple-E.xml
index 10504cacb..d937efa01 100644
--- a/tests/visual_tests/styles/simple-E.xml
+++ b/tests/visual_tests/styles/simple-E.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/simple-N.xml b/tests/visual_tests/styles/simple-N.xml
index 5511aa537..a5e6eebdf 100644
--- a/tests/visual_tests/styles/simple-N.xml
+++ b/tests/visual_tests/styles/simple-N.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/simple-NE.xml b/tests/visual_tests/styles/simple-NE.xml
index 7d1da73fb..8589c77d9 100644
--- a/tests/visual_tests/styles/simple-NE.xml
+++ b/tests/visual_tests/styles/simple-NE.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/simple-NW.xml b/tests/visual_tests/styles/simple-NW.xml
index fe27a7852..c133eb16e 100644
--- a/tests/visual_tests/styles/simple-NW.xml
+++ b/tests/visual_tests/styles/simple-NW.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/simple-S.xml b/tests/visual_tests/styles/simple-S.xml
index 657e83c86..2ceb0c594 100644
--- a/tests/visual_tests/styles/simple-S.xml
+++ b/tests/visual_tests/styles/simple-S.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/simple-SE.xml b/tests/visual_tests/styles/simple-SE.xml
index 06d816a04..eea79a652 100644
--- a/tests/visual_tests/styles/simple-SE.xml
+++ b/tests/visual_tests/styles/simple-SE.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/simple-SW.xml b/tests/visual_tests/styles/simple-SW.xml
index 2821a59a4..d7038b308 100644
--- a/tests/visual_tests/styles/simple-SW.xml
+++ b/tests/visual_tests/styles/simple-SW.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/simple-W.xml b/tests/visual_tests/styles/simple-W.xml
index 1fc96d7cf..ea8258984 100644
--- a/tests/visual_tests/styles/simple-W.xml
+++ b/tests/visual_tests/styles/simple-W.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/simple-shield.xml b/tests/visual_tests/styles/simple-shield.xml
index 43503a570..2debb3773 100644
--- a/tests/visual_tests/styles/simple-shield.xml
+++ b/tests/visual_tests/styles/simple-shield.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/simple.xml b/tests/visual_tests/styles/simple.xml
index ef03765a0..e965dc2a5 100644
--- a/tests/visual_tests/styles/simple.xml
+++ b/tests/visual_tests/styles/simple.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/test.py b/tests/visual_tests/test.py
index 3a1f56f5f..b073e9762 100755
--- a/tests/visual_tests/test.py
+++ b/tests/visual_tests/test.py
@@ -20,10 +20,10 @@ defaults = {
     'sizes': [(500, 100)],
     'scales':[1.0,2.0],
     'agg': True,
-    'cairo': True,
+    'cairo': False,
     # disabled for 2.2.x since cairo tests are unstable (springmeyer)
     #'cairo': mapnik.has_cairo(),
-    'grid': True
+    'grid': False
 }
 
 sizes_many_in_big_range = [(800, 100), (600, 100), (400, 100),
diff --git a/tests/visual_tests/test_python.py b/tests/visual_tests/test_python.py
index 00857fbd1..03703407f 100755
--- a/tests/visual_tests/test_python.py
+++ b/tests/visual_tests/test_python.py
@@ -85,7 +85,7 @@ formatnode.fill = mapnik.Color("green")
 format_trees = [
     ('TextNode', mapnik.FormattingText("[name]")),
     ('MyText', MyText()),
-    ('IfElse', IfElse("[nr] != '5'",
+    ('IfElse', IfElse("[nr] != 5",
                 mapnik.FormattingText("[name]"),
                 mapnik.FormattingText("'SPECIAL!'"))),
     ('Format', formatnode),