diff --git a/.gitignore b/.gitignore
index 86b59bbf..4f115293 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 *.pyc
-__pycache/
+__pycache__/
 /acceptance_tests/junitxml
-/.github/changelog-generator-cache
diff --git a/acceptance_tests/config/mapserver/fonts.conf b/acceptance_tests/config/mapserver/fonts.conf
new file mode 100644
index 00000000..5237ab91
--- /dev/null
+++ b/acceptance_tests/config/mapserver/fonts.conf
@@ -0,0 +1,6 @@
+dejavusans_bold /usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf
+dejavusansmono /usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf
+dejavusansmono_bold /usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf
+dejavuserif /usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf
+dejavusans /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf
+dejavuserif_bold /usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf
diff --git a/acceptance_tests/config/mapserver/mapserver.map b/acceptance_tests/config/mapserver/mapserver.map
index 4ae463f5..ba525aa0 100644
--- a/acceptance_tests/config/mapserver/mapserver.map
+++ b/acceptance_tests/config/mapserver/mapserver.map
@@ -19,8 +19,8 @@ MAP
     IMAGECOLOR 255 255 255
     STATUS ON
 
-    #FONTSET "fonts.conf"
-    #SYMBOLSET "symbol.sym"
+    FONTSET "fonts.conf"
+    SYMBOLSET "symbol.sym"
 
     OUTPUTFORMAT
         NAME jpeg
@@ -102,8 +102,9 @@ MAP
         END
         STATUS ON
         PROJECTION
-        "init=epsg:4326"
+            "init=epsg:4326"
         END
+        LABELITEM 'name'
         CLASS
             NAME "polygon"
             STYLE
@@ -114,7 +115,22 @@ MAP
                 COLOR 255 0 0
                 OPACITY 40
             END
+            STYLE
+                SYMBOL "square"
+                # Size should be > 0 from MapServer 7.6.5
+                SIZE 16
+                # Size should be >= 0 from MapServer 7.6.5
+                ANGLE 45
+                COLOR 0 0 0
+                OUTLINECOLOR 0 0 0
+            END
+            LABEL
+                FONT "dejavusans"
+                TYPE truetype
+                SIZE 10
+                COLOR 0 0 0
+                ANGLE -45
+            END
         END
     END
-
 END
diff --git a/acceptance_tests/config/mapserver/symbol.sym b/acceptance_tests/config/mapserver/symbol.sym
new file mode 100644
index 00000000..a3d9ce29
--- /dev/null
+++ b/acceptance_tests/config/mapserver/symbol.sym
@@ -0,0 +1,14 @@
+SYMBOLSET
+    SYMBOL
+        NAME "square"
+        TYPE VECTOR
+        POINTS
+            0 0
+            0 1
+            1 1
+            1 0
+            0 0
+        END
+        FILLED TRUE
+    END
+END