diff --git a/tests/visual_tests/images/formatting-5-500-100-1.0-agg-reference.png b/tests/visual_tests/images/formatting-5-500-100-1.0-agg-reference.png
new file mode 100644
index 000000000..b64b808be
Binary files /dev/null and b/tests/visual_tests/images/formatting-5-500-100-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/formatting-5-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/formatting-5-500-100-1.0-cairo-reference.png
new file mode 100644
index 000000000..6e735965e
Binary files /dev/null and b/tests/visual_tests/images/formatting-5-500-100-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/formatting-5-500-100-2.0-agg-reference.png b/tests/visual_tests/images/formatting-5-500-100-2.0-agg-reference.png
new file mode 100644
index 000000000..da0140c72
Binary files /dev/null and b/tests/visual_tests/images/formatting-5-500-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/formatting-5-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/formatting-5-500-100-2.0-cairo-reference.png
new file mode 100644
index 000000000..6ef13146f
Binary files /dev/null and b/tests/visual_tests/images/formatting-5-500-100-2.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/formatting-6-500-100-1.0-agg-reference.png b/tests/visual_tests/images/formatting-6-500-100-1.0-agg-reference.png
new file mode 100644
index 000000000..b64b808be
Binary files /dev/null and b/tests/visual_tests/images/formatting-6-500-100-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/formatting-6-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/formatting-6-500-100-1.0-cairo-reference.png
new file mode 100644
index 000000000..6e735965e
Binary files /dev/null and b/tests/visual_tests/images/formatting-6-500-100-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/formatting-6-500-100-2.0-agg-reference.png b/tests/visual_tests/images/formatting-6-500-100-2.0-agg-reference.png
new file mode 100644
index 000000000..da0140c72
Binary files /dev/null and b/tests/visual_tests/images/formatting-6-500-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/formatting-6-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/formatting-6-500-100-2.0-cairo-reference.png
new file mode 100644
index 000000000..6ef13146f
Binary files /dev/null and b/tests/visual_tests/images/formatting-6-500-100-2.0-cairo-reference.png differ
diff --git a/tests/visual_tests/styles/formatting-5.xml b/tests/visual_tests/styles/formatting-5.xml
new file mode 100644
index 000000000..1e727e33f
--- /dev/null
+++ b/tests/visual_tests/styles/formatting-5.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Map>
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <FontSet name="book"><Font face-name="DejaVu Sans Book"/></FontSet>
+
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <StyleName>My Style</StyleName>
+    <Datasource>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
+    </Datasource>
+  </Layer>
+
+    <Style name="My Style">
+    <Rule>
+      <PointSymbolizer/>
+      <!-- Basic test -->
+      <TextSymbolizer fontset-name="book" size="16" placement="point" dx="0" dy="5">
+      [name]+'&#10;'<Format face-name="DejaVu Sans Oblique" size="9" opacity="1">'('+[name]+')'</Format></TextSymbolizer>
+    </Rule>
+  </Style>
+
+</Map>
diff --git a/tests/visual_tests/styles/formatting-6.xml b/tests/visual_tests/styles/formatting-6.xml
new file mode 100644
index 000000000..830f80880
--- /dev/null
+++ b/tests/visual_tests/styles/formatting-6.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Map>
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <FontSet name="book"><Font face-name="DejaVu Sans Book"/></FontSet>
+  <FontSet name="oblique"><Font face-name="DejaVu Sans Oblique"/></FontSet>
+
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <StyleName>My Style</StyleName>
+    <Datasource>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
+    </Datasource>
+  </Layer>
+
+    <Style name="My Style">
+    <Rule>
+      <PointSymbolizer/>
+      <!-- Basic test -->
+      <TextSymbolizer fontset-name="book" size="16" placement="point" dx="0" dy="5">
+      [name]+'&#10;'<Format fontset-name="oblique" size="9" opacity="1">'('+[name]+')'</Format></TextSymbolizer>
+    </Rule>
+  </Style>
+
+</Map>
diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py
index 9f613ad7d..36d6fb06e 100755
--- a/tests/visual_tests/test.py
+++ b/tests/visual_tests/test.py
@@ -138,6 +138,8 @@ files = {
     'formatting-2': {'bbox':default_text_box},
     'formatting-3': {'bbox':default_text_box},
     'formatting-4': {'bbox':default_text_box},
+    'formatting-5': {'bbox':default_text_box},
+    'formatting-6': {'bbox':default_text_box},
     'expressionformat': {'bbox':default_text_box},
     'shieldsymbolizer-1': {'sizes': sizes_many_in_small_range,'bbox':default_text_box},
     'shieldsymbolizer-2': {'sizes': sizes_many_in_small_range,'bbox':default_text_box},