diff --git a/tests/visual_tests/grids/shield-on-line-and-avoid-edges-512-512-1.0-grid-reference.json b/tests/visual_tests/grids/shield-on-line-and-avoid-edges-512-512-1.0-grid-reference.json
new file mode 100644
index 000000000..0df919cc3
--- /dev/null
+++ b/tests/visual_tests/grids/shield-on-line-and-avoid-edges-512-512-1.0-grid-reference.json
@@ -0,0 +1,137 @@
+{
+ "keys": [
+  "", 
+  "1"
+ ], 
+ "data": {}, 
+ "grid": [
+  "                                                                                                                                ", 
+  "                                                                                                                                ", 
+  "                                                                                                                                ", 
+  "                                                   !!!!                                                                         ", 
+  "                                                !!!!!!!!                                                                        ", 
+  "                                               !!!!!!!!!                                                                        ", 
+  "                                              !!!!!!!!!!!                                                                       ", 
+  "                                              !!!!!!!!!!!                                                                       ", 
+  "                                              !!!!!!!!!!!                                                                       ", 
+  "                                             !!!!!!!!!!!!!                                                                      ", 
+  "                                             !!!!!!!!!!!!!                                                                      ", 
+  "                                             !!!!!!!!!!!!!!                                                                     ", 
+  "                                            !!!!!!!!!!!!!!!!                                                                    ", 
+  "                                           !!!!!!!!!!!!!!!!!                                                                    ", 
+  "                                          !!!!!!!!!!!!!!!!!!                                                                    ", 
+  "                                          !!!!!!!!!!!!!!!!!!!                                                                   ", 
+  "                                          !!!!!!!!!!!!!!!!!!!                                                                   ", 
+  "                                         !!!!!!!!!!!!!!!!!!!!!                                                                  ", 
+  "                                         !!!!!!!!!!!!!!!!!!!!!!                                                                 ", 
+  "                                        !!!!!!!!!!!!!!!!!!!!!!!                                                                 ", 
+  "                                       !!!!!!!!!!!!!!!!!!!!!!!!!                                                                ", 
+  "                                       !!!!!!!!!!!!!!!!!!!!!!!!!                                                                ", 
+  "                                       !!!!!!!!!!!!!!!!!!!!!!!!!                                                                ", 
+  "                                      !!!!!!!!!!!!!!!!!!!!!!!!!!!                                                               ", 
+  "                                      !!!!!!!!!!!!!!!!!!!!!!!!!!!                                                               ", 
+  "                                     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!                                                              ", 
+  "                                     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!                                                             ", 
+  "                                    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!                                                             ", 
+  "                                    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!                                                             ", 
+  "                                   !!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!                                                            ", 
+  "                                   !!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!                                                            ", 
+  "                                   !!!!!!!!!!!!!!!  !!!!!!!!!!!!!!!!!                                                           ", 
+  "                                  !!!!!!!!!!!!!!!!   !!!!!!!!!!!!!!!!!                                                          ", 
+  "                                 !!!!!!!!!!!!!!!!!   !!!!!!!!!!!!!!!!!                                                          ", 
+  "                                !!!!!!!!!!!!!!!!!!    !!!!!!!!!!!!!!!!                                                          ", 
+  "                                !!!!!!!!!!!!!!!!!      !!!!!!!!!!!!!!!!                                                         ", 
+  "                                !!!!!!!!!!!!!!!!       !!!!!!!!!!!!!!!!                                                         ", 
+  "                               !!!!!!!!!!!!!!!!         !!!!!!!!!!!!!!!!                                                        ", 
+  "                               !!!!!!!!!!!!!!!!         !!!!!!!!!!!!!!!!!                                                       ", 
+  "                              !!!!!!!!!!!!!!!!!         !!!!!!!!!!!!!!!!!                                                       ", 
+  "                             !!!!!!!!!!!!!!!!!           !!!!!!!!!!!!!!!!!                                                      ", 
+  "                             !!!!!!!!!!!!!!!!!            !!!!!!!!!!!!!!!!                                                      ", 
+  "                             !!!!!!!!!!!!!!!!             !!!!!!!!!!!!!!!!                                                      ", 
+  "                            !!!!!!!!!!!!!!!!               !!!!!!!!!!!!!!!!                                                     ", 
+  "                            !!!!!!!!!!!!!!!!               !!!!!!!!!!!!!!!!                                                     ", 
+  "                           !!!!!!!!!!!!!!!!!               !!!!!!!!!!!!!!!!!                                                    ", 
+  "                           !!!!!!!!!!!!!!!!                 !!!!!!!!!!!!!!!!!                                                   ", 
+  "                          !!!!!!!!!!!!!!!!!                 !!!!!!!!!!!!!!!!!                                                   ", 
+  "                         !!!!!!!!!!!!!!!!!                   !!!!!!!!!!!!!!!!                                                   ", 
+  "                         !!!!!!!!!!!!!!!!!                    !!!!!!!!!!!!!!!!                                                  ", 
+  "                         !!!!!!!!!!!!!!!!                     !!!!!!!!!!!!!!!!                                                  ", 
+  "                         !!!!!!!!!!!!!!!                      !!!!!!!!!!!!!!!!!                                                 ", 
+  "                        !!!!!!!!!!!!!!!!                       !!!!!!!!!!!!!!!!!                                                ", 
+  "                       !!!!!!!!!!!!!!!!!                       !!!!!!!!!!!!!!!!!                                                ", 
+  "                      !!!!!!!!!!!!!!!!!                         !!!!!!!!!!!!!!!!!                                               ", 
+  "                      !!!!!!!!!!!!!!!!!                          !!!!!!!!!!!!!!!!                                               ", 
+  "                      !!!!!!!!!!!!!!!!                           !!!!!!!!!!!!!!!!                                               ", 
+  "                     !!!!!!!!!!!!!!!!                             !!!!!!!!!!!!!!!!                                              ", 
+  "                     !!!!!!!!!!!!!!!!                             !!!!!!!!!!!!!!!!                                              ", 
+  "                    !!!!!!!!!!!!!!!!!                             !!!!!!!!!!!!!!!!!                                             ", 
+  "                    !!!!!!!!!!!!!!!!                               !!!!!!!!!!!!!!!!!                                            ", 
+  "                   !!!!!!!!!!!!!!!!!                                !!!!!!!!!!!!!!!!                                            ", 
+  "                   !!!!!!!!!!!!!!!!                                 !!!!!!!!!!!!!!!!                                            ", 
+  "                  !!!!!!!!!!!!!!!!                                   !!!!!!!!!!!!!!!!                                           ", 
+  "                  !!!!!!!!!!!!!!!!                                   !!!!!!!!!!!!!!!!                                           ", 
+  "                  !!!!!!!!!!!!!!!                                    !!!!!!!!!!!!!!!!!                                          ", 
+  "                 !!!!!!!!!!!!!!!!                                     !!!!!!!!!!!!!!!!!                                         ", 
+  "                !!!!!!!!!!!!!!!!!                                     !!!!!!!!!!!!!!!!!                                         ", 
+  "               !!!!!!!!!!!!!!!!!                                       !!!!!!!!!!!!!!!!                                         ", 
+  "               !!!!!!!!!!!!!!!!!                                        !!!!!!!!!!!!!!!!                                        ", 
+  "               !!!!!!!!!!!!!!!!                                         !!!!!!!!!!!!!!!!                                        ", 
+  "              !!!!!!!!!!!!!!!!                                           !!!!!!!!!!!!!!!!                                       ", 
+  "              !!!!!!!!!!!!!!!!                                           !!!!!!!!!!!!!!!!!                                      ", 
+  "             !!!!!!!!!!!!!!!!!                                           !!!!!!!!!!!!!!!!!                                      ", 
+  "            !!!!!!!!!!!!!!!!!                                             !!!!!!!!!!!!!!!!!                                     ", 
+  "            !!!!!!!!!!!!!!!!!                                              !!!!!!!!!!!!!!!!                                     ", 
+  "            !!!!!!!!!!!!!!!!                                               !!!!!!!!!!!!!!!!                                     ", 
+  "           !!!!!!!!!!!!!!!!                                                 !!!!!!!!!!!!!!!!                                    ", 
+  "           !!!!!!!!!!!!!!!!                                                 !!!!!!!!!!!!!!!!                                    ", 
+  "          !!!!!!!!!!!!!!!!!                                                 !!!!!!!!!!!!!!!!!                                   ", 
+  "          !!!!!!!!!!!!!!!!                                                   !!!!!!!!!!!!!!!!!                                  ", 
+  "         !!!!!!!!!!!!!!!!!                                                   !!!!!!!!!!!!!!!!!                                  ", 
+  "        !!!!!!!!!!!!!!!!!                                                     !!!!!!!!!!!!!!!!                                  ", 
+  "        !!!!!!!!!!!!!!!!                                                       !!!!!!!!!!!!!!!!                                 ", 
+  "        !!!!!!!!!!!!!!!!                                                       !!!!!!!!!!!!!!!!                                 ", 
+  "        !!!!!!!!!!!!!!!                                                        !!!!!!!!!!!!!!!!!                       !!!      ", 
+  "       !!!!!!!!!!!!!!!!                                                         !!!!!!!!!!!!!!!!!                     !!!!!     ", 
+  "      !!!!!!!!!!!!!!!!!                                                         !!!!!!!!!!!!!!!!!                    !!!!!!!    ", 
+  "     !!!!!!!!!!!!!!!!!                                                           !!!!!!!!!!!!!!!!!                   !!!!!!!    ", 
+  "     !!!!!!!!!!!!!!!!!                                                            !!!!!!!!!!!!!!!!                  !!!!!!!!    ", 
+  "     !!!!!!!!!!!!!!!!                                                             !!!!!!!!!!!!!!!!                !!!!!!!!!!!  !", 
+  "    !!!!!!!!!!!!!!!!                                                               !!!!!!!!!!!!!!!!              !!!!!!!!!!!! ! ", 
+  "   !!!!!!!!!!!!!!!!!                                                               !!!!!!!!!!!!!!!!!            !!!!!!!!!!!!!!  ", 
+  "   !!!!!!!!!!!!!!!!!                                                               !!!!!!!!!!!!!!!!!           !!!!!!!!!!!!!!   ", 
+  "   !!!!!!!!!!!!!!!!                                                                 !!!!!!!!!!!!!!!!!          !!!!!!!!!!!!!!   ", 
+  "  !!!!!!!!!!!!!!!!!                                                                  !!!!!!!!!!!!!!!!          !!!!!!!!!!!!!!!  ", 
+  "  !!!!!!!!!!!!!!!!                                                                   !!!!!!!!!!!!!!!!       !!!!!!!!!!!!!!!!!!  ", 
+  "  !!!!!!!!!!!!!!!                                                                     !!!!!!!!!!!!!!!!     !!!!!!!!!!!!!!!!!!!  ", 
+  "  !!!!!!!!!!!!!!!                                                                     !!!!!!!!!!!!!!!!    !!!!!!!!!!!!!!!!!!!!  ", 
+  "  !!!!!!!!!!!!!!!                                                                     !!!!!!!!!!!!!!!!!   !!!!!!!!!!!!!!!!!!!!  ", 
+  "  !!!!!!!!!!!!!!                                                                       !!!!!!!!!!!!!!!!!  !!!!!!!!!!!!!!!!!!!!  ", 
+  " !!!!!!!!!!!!!!!                                                                       !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   ", 
+  " !!!!!!!!!!!!!!                                                                         !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   ", 
+  " !!!!!!!!!!!!!!                                                                          !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   ", 
+  " !!!!!!!!!!!!!                                                                           !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   ", 
+  "  !!!!!!!!!!!                                                                             !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   ", 
+  "  !!!!!!!!!!!                                                                             !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!    ", 
+  "  !!!!!!!!!!!                                                                             !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!    ", 
+  "  !!!!!!!!!!                                                                               !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!    ", 
+  "  !!!!!!!!!!                                                                                !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!     ", 
+  "  !!!!!!!!!                                                                                 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!      ", 
+  "  !!!!!!!!!                                                                                  !!!!!!!!!!!!!!!!!!!!!!!!!!         ", 
+  "   !!!!!!!                                                                                   !!!!!!!!!!!!!!!!!!!!!!!!!!         ", 
+  " ! !!!!!!!                                                                                   !!!!!!!!!!!!!!!!!!!!!!!!!          ", 
+  "    !!!!!                                                                                     !!!!!!!!!!!!!!!!!!!!!!!!          ", 
+  "!    !!!                                                                                       !!!!!!!!!!!!!!!!!!!!!!           ", 
+  "                                                                                               !!!!!!!!!!!!!!!!!!!              ", 
+  "                                                                                                !!!!!!!!!!!!!!!!!!              ", 
+  "                                                                                                !!!!!!!!!!!!!!!!!               ", 
+  "                                                                                                !!!!!!!!!!!!!!!!!               ", 
+  "                                                                                                 !!!!!!!!!!!!!!!                ", 
+  "                                                                                                 !!!!!!!!!!!!!!                 ", 
+  "                                                                                                  !!!!!!!!!!                    ", 
+  "                                                                                                   !!!!!!!!!                    ", 
+  "                                                                                                     !!!!!!!                    ", 
+  "                                                                                                      !!!!!                     ", 
+  "                                                                                                       !!!                      ", 
+  "                                                                                                                                "
+ ]
+}
\ No newline at end of file
diff --git a/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-1.0-agg-reference.png b/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-1.0-agg-reference.png
new file mode 100644
index 000000000..fc8ed6026
Binary files /dev/null and b/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-1.0-cairo-reference.png b/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-1.0-cairo-reference.png
new file mode 100644
index 000000000..fb8081123
Binary files /dev/null and b/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-2.0-agg-reference.png b/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-2.0-agg-reference.png
new file mode 100644
index 000000000..09b414e37
Binary files /dev/null and b/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-2.0-cairo-reference.png b/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-2.0-cairo-reference.png
new file mode 100644
index 000000000..cb05b77a8
Binary files /dev/null and b/tests/visual_tests/images/shield-on-line-and-avoid-edges-512-512-2.0-cairo-reference.png differ
diff --git a/tests/visual_tests/styles/shield-on-line-and-avoid-edges.xml b/tests/visual_tests/styles/shield-on-line-and-avoid-edges.xml
new file mode 100644
index 000000000..22dd1f464
--- /dev/null
+++ b/tests/visual_tests/styles/shield-on-line-and-avoid-edges.xml
@@ -0,0 +1,33 @@
+<Map>
+<Style name="line" filter-mode="first" >
+  <Rule>
+    <LineSymbolizer stroke="#000000" />
+  </Rule>
+</Style>
+<Style name="point-placement" filter-mode="first" >
+  <Rule>
+    <ShieldSymbolizer
+      allow-overlap="true"
+      face-name="DejaVu Sans Book"
+      file="shape://ellipse"
+      placement="line"
+      spacing="30"
+      transform="scale(4,10)"
+      fill="blue"
+      avoid-edges="true"
+      minimum-padding="5"
+      clip="false">
+    </ShieldSymbolizer>
+    <DebugSymbolizer />
+  </Rule>
+</Style>
+<Layer name="carto_tests">
+    <StyleName>line</StyleName>
+    <StyleName>point-placement</StyleName>
+    <Datasource>
+       <Parameter name="type">csv</Parameter>
+       <Parameter name="file">../data/marker-on-line.csv</Parameter>
+       <Parameter name="separator">|</Parameter>
+    </Datasource>
+  </Layer>
+</Map>
diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py
index 8b7639f10..3f8796d6f 100755
--- a/tests/visual_tests/test.py
+++ b/tests/visual_tests/test.py
@@ -269,7 +269,8 @@ files = {
     'line-smooth-and-offset':{'sizes':[(512,512)]},
     'line-pattern-smooth-and-offset':{'sizes':[(512,512)]},
     'halo-comp-op-on-satellite':{'sizes':[(450,450)]},
-    'marker-whole-multi-polygon':{'sizes':[(512,512)]}
+    'marker-whole-multi-polygon':{'sizes':[(512,512)]},
+    'shield-on-line-and-avoid-edges':{'sizes':[(512,512)]},
     }
 
 class Reporting: