diff --git a/test/rendering-mss/issue_343a.xml b/test/rendering-mss/issue_343a.xml
index 61e7fce9b..c4785e0f8 100644
--- a/test/rendering-mss/issue_343a.xml
+++ b/test/rendering-mss/issue_343a.xml
@@ -1,23 +1,23 @@
-<Style name="style" filter-mode="first">
+<Style filter-mode="first" name="style">
   <Rule>
     <MaxScaleDenominator>200000</MaxScaleDenominator>
-    <Filter>([tourism].match('anythingelse')) and ([tourism] = 'attraction')</Filter>
+    <Filter><![CDATA[([tourism].match('anythingelse')) and ([tourism] = 'attraction')]]></Filter>
     <MarkersSymbolizer fill="#ff0000" marker-type="ellipse" width="20" />
   </Rule>
   <Rule>
     <MaxScaleDenominator>400000</MaxScaleDenominator>
     <MinScaleDenominator>200000</MinScaleDenominator>
-    <Filter>([tourism].match('anythingelse')) and ([tourism] = 'attraction')</Filter>
+    <Filter><![CDATA[([tourism].match('anythingelse')) and ([tourism] = 'attraction')]]></Filter>
     <MarkersSymbolizer fill="#0000ff" marker-type="ellipse" width="6" />
   </Rule>
-  <Rule>
-    <MaxScaleDenominator>200000</MaxScaleDenominator>
-    <Filter>([tourism] = 'attraction')</Filter>
-    <MarkersSymbolizer fill="#ff0000" marker-type="ellipse" width="20" />
-  </Rule>
   <Rule>
     <MaxScaleDenominator>400000</MaxScaleDenominator>
-    <Filter>([tourism].match('anythingelse'))</Filter>
+    <Filter><![CDATA[([tourism].match('anythingelse'))]]></Filter>
     <MarkersSymbolizer fill="#0000ff" marker-type="ellipse" width="6" />
   </Rule>
+  <Rule>
+    <MaxScaleDenominator>200000</MaxScaleDenominator>
+    <Filter><![CDATA[([tourism] = 'attraction')]]></Filter>
+    <MarkersSymbolizer fill="#ff0000" marker-type="ellipse" width="20" />
+  </Rule>
 </Style>
diff --git a/test/rendering-mss/issue_343b.xml b/test/rendering-mss/issue_343b.xml
index f23e59d3b..abf374850 100644
--- a/test/rendering-mss/issue_343b.xml
+++ b/test/rendering-mss/issue_343b.xml
@@ -1,23 +1,23 @@
-<Style name="style" filter-mode="first">
+<Style filter-mode="first" name="style">
   <Rule>
     <MaxScaleDenominator>200000</MaxScaleDenominator>
-    <Filter>([tourism] = 'attraction') and ([tourism].match('anythingelse'))</Filter>
+    <Filter><![CDATA[([tourism] = 'attraction') and ([tourism].match('anythingelse'))]]></Filter>
     <MarkersSymbolizer fill="#ff0000" marker-type="ellipse" width="20" />
   </Rule>
   <Rule>
     <MaxScaleDenominator>400000</MaxScaleDenominator>
     <MinScaleDenominator>200000</MinScaleDenominator>
-    <Filter>([tourism] = 'attraction') and ([tourism].match('anythingelse'))</Filter>
+    <Filter><![CDATA[([tourism] = 'attraction') and ([tourism].match('anythingelse'))]]></Filter>
     <MarkersSymbolizer fill="#0000ff" marker-type="ellipse" width="6" />
   </Rule>
   <Rule>
     <MaxScaleDenominator>200000</MaxScaleDenominator>
-    <Filter>([tourism] = 'attraction')</Filter>
+    <Filter><![CDATA[([tourism] = 'attraction')]]></Filter>
     <MarkersSymbolizer fill="#ff0000" marker-type="ellipse" width="20" />
   </Rule>
   <Rule>
     <MaxScaleDenominator>400000</MaxScaleDenominator>
-    <Filter>([tourism].match('anythingelse'))</Filter>
+    <Filter><![CDATA[([tourism].match('anythingelse'))]]></Filter>
     <MarkersSymbolizer fill="#0000ff" marker-type="ellipse" width="6" />
   </Rule>
 </Style>