diff --git a/tests/visual_tests/styles/expressionformat.xml b/tests/visual_tests/styles/expressionformat.xml
index 81c7b65c3..4a6315bdd 100644
--- a/tests/visual_tests/styles/expressionformat.xml
+++ b/tests/visual_tests/styles/expressionformat.xml
@@ -14,7 +14,7 @@
     <Rule>
       <PointSymbolizer/>
       <TextSymbolizer face-name="DejaVu Sans Book" placement="point" dx="0" dy="5">
-          <ExpressionFormat size="[nr]" opacity="1">[name]</ExpressionFormat>
+          <Format size="[nr]" opacity="1">[name]</Format>
       </TextSymbolizer>
     </Rule>
   </Style>
diff --git a/tests/visual_tests/styles/text-bug1820+0.xml b/tests/visual_tests/styles/text-bug1820+0.xml
index 97352041c..eed6d358d 100644
--- a/tests/visual_tests/styles/text-bug1820+0.xml
+++ b/tests/visual_tests/styles/text-bug1820+0.xml
@@ -13,7 +13,7 @@
     <Style name="My Style">
         <Rule>
             <PointSymbolizer opacity="0.5" ignore-placement="true"/>
-            <TextSymbolizer face-name="DejaVu Sans Book" size="16" wrap-width="4" placement="point" dx="0" dy="0"><ExpressionFormat line-spacing="[nr]*10+1">[name]</ExpressionFormat></TextSymbolizer>
+            <TextSymbolizer face-name="DejaVu Sans Book" size="16" wrap-width="4" placement="point" dx="0" dy="0"><Format line-spacing="[nr]*10+1">[name]</Format></TextSymbolizer>
         </Rule>
     </Style>
 
diff --git a/tests/visual_tests/styles/text-bug1820+1.xml b/tests/visual_tests/styles/text-bug1820+1.xml
index ce860fe25..563516ad8 100644
--- a/tests/visual_tests/styles/text-bug1820+1.xml
+++ b/tests/visual_tests/styles/text-bug1820+1.xml
@@ -13,7 +13,7 @@
     <Style name="My Style">
         <Rule>
             <PointSymbolizer opacity="0.5" ignore-placement="true"/>
-            <TextSymbolizer face-name="DejaVu Sans Book" size="16" wrap-width="4" placement="point" dx="0" dy="1"><ExpressionFormat line-spacing="[nr]*10+1">[name]</ExpressionFormat></TextSymbolizer>
+            <TextSymbolizer face-name="DejaVu Sans Book" size="16" wrap-width="4" placement="point" dx="0" dy="1"><Format line-spacing="[nr]*10+1">[name]</Format></TextSymbolizer>
         </Rule>
     </Style>
 
diff --git a/tests/visual_tests/styles/text-bug1820-1.xml b/tests/visual_tests/styles/text-bug1820-1.xml
index bd7c7ac3b..ec4984fb2 100644
--- a/tests/visual_tests/styles/text-bug1820-1.xml
+++ b/tests/visual_tests/styles/text-bug1820-1.xml
@@ -13,7 +13,7 @@
     <Style name="My Style">
         <Rule>
             <PointSymbolizer opacity="0.5" ignore-placement="true"/>
-            <TextSymbolizer face-name="DejaVu Sans Book" size="16" wrap-width="4" placement="point" dx="0" dy="-1"><ExpressionFormat line-spacing="[nr]*10+1">[name]</ExpressionFormat></TextSymbolizer>
+            <TextSymbolizer face-name="DejaVu Sans Book" size="16" wrap-width="4" placement="point" dx="0" dy="-1"><Format line-spacing="[nr]*10+1">[name]</Format></TextSymbolizer>
         </Rule>
     </Style>
 
diff --git a/tests/visual_tests/styles/text-expressionformat-color.xml b/tests/visual_tests/styles/text-expressionformat-color.xml
index 7ef679c0f..2eec041e9 100644
--- a/tests/visual_tests/styles/text-expressionformat-color.xml
+++ b/tests/visual_tests/styles/text-expressionformat-color.xml
@@ -14,8 +14,8 @@
     <Rule>
       <PointSymbolizer/>
       <TextSymbolizer allow-overlap="true" face-name="DejaVu Sans Book" size="16" placement="point" dy="5">
-        <ExpressionFormat fill="'#ff0000'">"red text"+'&#10;'</ExpressionFormat>
-        <ExpressionFormat fill="[color]">"test"</ExpressionFormat>
+        <Format fill="'#ff0000'">"red text"+'&#10;'</Format>
+        <Format fill="[color]">"test"</Format>
       </TextSymbolizer>
     </Rule>
   </Style>