diff --git a/tests/data/good_maps/building_symbolizer.xml b/tests/data/good_maps/building_symbolizer.xml
new file mode 100644
index 000000000..4a591782a
--- /dev/null
+++ b/tests/data/good_maps/building_symbolizer.xml
@@ -0,0 +1,21 @@
+<Map bgcolor="steelblue" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
+
+  <Style name="test">
+    <Rule>
+      <BuildingSymbolizer>
+        <CssParameter name="fill">yellow</CssParameter>
+        <CssParameter name="fill-opacity">.7</CssParameter>
+        <CssParameter name="height">30</CssParameter>
+      </BuildingSymbolizer>
+    </Rule>  
+  </Style>
+
+  <Layer name="lay" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
+    <StyleName>test</StyleName>
+    <Datasource base="shp">
+      <Parameter name="type">shape</Parameter>
+      <Parameter name="file">../../data/shp/poly.shp</Parameter>
+    </Datasource>
+  </Layer>
+  
+</Map>
\ No newline at end of file
diff --git a/tests/data/good_maps/datasource.xml b/tests/data/good_maps/datasource.xml
index facccfb80..7bf565d2b 100644
--- a/tests/data/good_maps/datasource.xml
+++ b/tests/data/good_maps/datasource.xml
@@ -5,17 +5,7 @@
     <Parameter name="file">../../data/shp/poly.shp</Parameter>
   </Datasource>
 
-  <Style name="test">
-    <Rule>
-      <BuildingSymbolizer>
-        <CssParameter name="fill">yellow</CssParameter>
-        <CssParameter name="fill-opacity">1</CssParameter>
-        <CssParameter name="height">30</CssParameter>
-      </BuildingSymbolizer>
-    </Rule>  
-  </Style>
-
-  <Layer name="lay" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs ">
+  <Layer name="lay" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
     <StyleName>test</StyleName>
     <Datasource base="shp">
       <Parameter name="type">shape</Parameter>
diff --git a/tests/data/good_maps/polygon_symbolizer.xml b/tests/data/good_maps/polygon_symbolizer.xml
new file mode 100644
index 000000000..4efdfc147
--- /dev/null
+++ b/tests/data/good_maps/polygon_symbolizer.xml
@@ -0,0 +1,25 @@
+<!-- see: http://trac.mapnik.org/changeset/574 -->
+<Map bgcolor="transparent" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs">
+
+  <FileSource name="foo">../images/</FileSource>
+  
+  <Style name="test">
+    <Rule>
+      <PolygonSymbolizer>
+        <CssParameter name="fill">lavender</CssParameter>
+        <CssParameter name="fill-opacity">.5</CssParameter>
+      </PolygonSymbolizer>
+      <PointSymbolizer base="foo" file="dummy.png" width="16" height="16" type="png" />
+    </Rule>  
+  </Style>
+
+  <Layer name="lay" srs="+proj=longlat +ellps=airy +datum=OSGB36 +no_defs ">
+    <StyleName>test</StyleName>
+    <Datasource>
+      <Parameter name="type">shape</Parameter>
+      <Parameter name="base">../../data/shp/</Parameter>
+      <Parameter name="file">poly.shp</Parameter>
+    </Datasource>
+  </Layer>
+  
+</Map>
\ No newline at end of file