diff --git a/tests/visual_tests/python-MyText-reference.png b/tests/visual_tests/python-MyText-reference.png
new file mode 100644
index 000000000..836393a24
Binary files /dev/null and b/tests/visual_tests/python-MyText-reference.png differ
diff --git a/tests/visual_tests/python-TextNode-reference.png b/tests/visual_tests/python-TextNode-reference.png
new file mode 100644
index 000000000..caad4208a
Binary files /dev/null and b/tests/visual_tests/python-TextNode-reference.png differ
diff --git a/tests/visual_tests/test_python.py b/tests/visual_tests/test_python.py
index 28f84bfb2..0ae03db5e 100755
--- a/tests/visual_tests/test_python.py
+++ b/tests/visual_tests/test_python.py
@@ -6,27 +6,33 @@ class MyText(mapnik.FormatingNode):
     def __init__(self):
         mapnik.FormatingNode.__init__(self)
         self.expr = mapnik.Expression("[name]")
+        self.expr_nr = mapnik.Expression("[nr]")
 
     def apply(self, properties, feature, output):
         colors = [mapnik.Color('red'), 
                   mapnik.Color('green'), 
                   mapnik.Color('blue')]
         text = self.expr.evaluate(feature)
-        i = 0
-        my_properties = mapnik.CharProperties(properties)
-        for char in text:
-            my_properties.fill = colors[i % len(colors)]
-            output.append(my_properties, char)
-            i += 1
+        if int(feature['nr']) > 5:
+            i = 0
+            my_properties = mapnik.CharProperties(properties)
+            for char in text:
+                my_properties.fill = colors[i % len(colors)]
+                output.append(my_properties, char)
+                i += 1
+        else:
+            output.append(properties, text)
             
     def add_expressions(self, output):
         output.insert(self.expr)
+        output.insert(self.expr_nr)
 
-m = mapnik.Map(600,300)
+m = mapnik.Map(600, 100)
 m.background = mapnik.Color('white')
 
 text = mapnik.TextSymbolizer()
-text.face_name = 'DejaVu Sans Book'
+text.placements.defaults.displacement = (0, 5)
+text.placements.defaults.default_format.face_name = 'DejaVu Sans Book'
 
 point = mapnik.PointSymbolizer()
 
@@ -45,7 +51,8 @@ layer.datasource = mapnik.Shapefile(file="points.shp")
 layer.styles.append('Style')
 m.layers.append(layer)
 
-m.zoom_all()
+bbox = mapnik.Box2d(-0.05, -0.01, 0.95, 0.01)
+m.zoom_to_box(bbox)
 
 
 format_trees = [