diff --git a/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png b/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png
index fe3ae81f5..808c0bdca 100644
Binary files a/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png and b/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/collision-600-400-2.0-agg-reference.png b/tests/visual_tests/images/collision-600-400-2.0-agg-reference.png
index 9c7cd61b0..d0e7a446f 100644
Binary files a/tests/visual_tests/images/collision-600-400-2.0-agg-reference.png and b/tests/visual_tests/images/collision-600-400-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/styles/collision.xml b/tests/visual_tests/styles/collision.xml
index 3bd807de0..7b717fc9f 100644
--- a/tests/visual_tests/styles/collision.xml
+++ b/tests/visual_tests/styles/collision.xml
@@ -9,6 +9,7 @@
   <Style name="text">
     <Rule>
       <TextSymbolizer spacing="10" size="14" halo-radius="2" face-name="DejaVu Sans Oblique" placement="line">'text'</TextSymbolizer>
+      <DebugSymbolizer />
     </Rule>
   </Style>
 
diff --git a/tests/visual_tests/styles/line-offset.xml b/tests/visual_tests/styles/line-offset.xml
index 5746cf981..8f4dee7ae 100644
--- a/tests/visual_tests/styles/line-offset.xml
+++ b/tests/visual_tests/styles/line-offset.xml
@@ -15,11 +15,11 @@
         </Rule>
         <Rule>
             <Filter>[ref]=1 or [ref]=3</Filter>
-            <TextSymbolizer size="14" fill="#000" spacing="1" placement="line" face-name="DejaVu Sans Book" halo-radius="1" dy="-10">'Some Text'</TextSymbolizer>
+            <TextSymbolizer size="14" fill="#000" spacing="1" placement="line" face-name="DejaVu Sans Book" halo-radius="1" dy="-10" vertical-alignment="middle">'Some Text'</TextSymbolizer>
         </Rule>
         <Rule>
             <Filter>[ref]=2 or [ref]=4</Filter>
-            <TextSymbolizer size="14" fill="#000" spacing="1" placement="line" face-name="DejaVu Sans Book" halo-radius="1" dy="10">'Some Text'</TextSymbolizer>
+            <TextSymbolizer size="14" fill="#000" spacing="1" placement="line" face-name="DejaVu Sans Book" halo-radius="1" dy="10" vertical-alignment="middle">'Some Text'</TextSymbolizer>
         </Rule>
         <Rule>
             <Filter>[name]</Filter>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-1.xml b/tests/visual_tests/styles/shieldsymbolizer-1.xml
index cc37000d5..0af96590a 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-1.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-1.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Without unlock-image -->
 <!DOCTYPE Map>
 <Map background-color="green" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" minimum-version="2.0.0">