diff --git a/tests/visual_tests/grids/point-symbolizer-overlap-placement-expr-500-500-1.0-grid-reference.json b/tests/visual_tests/grids/point-symbolizer-overlap-placement-expr-500-500-1.0-grid-reference.json
new file mode 100644
index 000000000..f0e53b1ca
--- /dev/null
+++ b/tests/visual_tests/grids/point-symbolizer-overlap-placement-expr-500-500-1.0-grid-reference.json
@@ -0,0 +1,157 @@
+{
+ "keys": [
+  "", 
+  "1", 
+  "2", 
+  "3", 
+  "5", 
+  "7", 
+  "8", 
+  "9", 
+  "10", 
+  "11", 
+  "13", 
+  "15", 
+  "16", 
+  "17", 
+  "18", 
+  "19", 
+  "21", 
+  "22", 
+  "23", 
+  "25", 
+  "26", 
+  "27", 
+  "29", 
+  "30", 
+  "31"
+ ], 
+ "data": {}, 
+ "grid": [
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                !!!###                       $$$                          %%%                           &&'''                ", 
+  "               !!!#####                     $$$$$                        %%%%%                         &&'''''               ", 
+  "               !!!#####                     $$$$$                        %%%%%                         &&'''''               ", 
+  "               !!!#####                     $$$$$                        %%%%%                         &&'''''               ", 
+  "                !!!###                       $$$                          %%%                           &&''''               ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                (())))                       ****                        ++++                          ,,,----               ", 
+  "               ((()))))                     *****                        +++++                         ,,-----               ", 
+  "               ((()))))                     *****                        +++++                         ,,-----               ", 
+  "                (()))))                     *****                        +++++                         ,,,----               ", 
+  "                 (()))                       ***                          +++                           ,,,--                ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                ...///                       000                          11222                         333                  ", 
+  "               .../////                     00000                        1122222                       33333                 ", 
+  "               .../////                     00000                        1122222                       33333                 ", 
+  "               .../////                     00000                        1122222                       33333                 ", 
+  "                ...///                       000                          112222                        333                  ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                445555                       6666                        7778888                       9999                  ", 
+  "               44455555                     66666                        7788888                       99999                 ", 
+  "               44455555                     66666                        7788888                       99999                 ", 
+  "                4455555                     66666                        7778888                       99999                 ", 
+  "                 44555                       666                          77788                         999                  ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             "
+ ]
+}
\ No newline at end of file
diff --git a/tests/visual_tests/grids/text-allow-overlap-expr-500-500-1.0-grid-reference.json b/tests/visual_tests/grids/text-allow-overlap-expr-500-500-1.0-grid-reference.json
new file mode 100644
index 000000000..3615097a4
--- /dev/null
+++ b/tests/visual_tests/grids/text-allow-overlap-expr-500-500-1.0-grid-reference.json
@@ -0,0 +1,145 @@
+{
+ "keys": [
+  "", 
+  "2", 
+  "1", 
+  "3", 
+  "5", 
+  "8", 
+  "7", 
+  "10", 
+  "9", 
+  "11", 
+  "13", 
+  "16", 
+  "15"
+ ], 
+ "data": {}, 
+ "grid": [
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "               !#!!#!!!                      $ $$ $$                     %  %%%%%                      &&&'&&&'              ", 
+  "               #! #! !                      $$ $$$                       %% %%%                        '& &''&               ", 
+  "               ! !#  #                      $   $$ $                      %  %% %                      && &'& '              ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "               ()(()(((                      * ** **                     +  +  ++                      , ,-,,,-              ", 
+  "                ( ((                        ** ***                       ++ +++                        ,, ,--,               ", 
+  "               ))))  (                      **  **                       ++  ++                        ,, ,-,                ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             "
+ ]
+}
\ No newline at end of file
diff --git a/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-1.0-agg-reference.png b/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-1.0-agg-reference.png
new file mode 100644
index 000000000..ff046ca79
Binary files /dev/null and b/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-1.0-cairo-reference.png b/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-1.0-cairo-reference.png
new file mode 100644
index 000000000..124833e46
Binary files /dev/null and b/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-2.0-agg-reference.png b/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-2.0-agg-reference.png
new file mode 100644
index 000000000..ad8ebe815
Binary files /dev/null and b/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-2.0-cairo-reference.png b/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-2.0-cairo-reference.png
new file mode 100644
index 000000000..682833330
Binary files /dev/null and b/tests/visual_tests/images/point-symbolizer-overlap-placement-expr-500-500-2.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/text-allow-overlap-expr-500-500-1.0-agg-reference.png b/tests/visual_tests/images/text-allow-overlap-expr-500-500-1.0-agg-reference.png
new file mode 100644
index 000000000..983738828
Binary files /dev/null and b/tests/visual_tests/images/text-allow-overlap-expr-500-500-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/text-allow-overlap-expr-500-500-1.0-cairo-reference.png b/tests/visual_tests/images/text-allow-overlap-expr-500-500-1.0-cairo-reference.png
new file mode 100644
index 000000000..e04ebca91
Binary files /dev/null and b/tests/visual_tests/images/text-allow-overlap-expr-500-500-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/text-allow-overlap-expr-500-500-2.0-agg-reference.png b/tests/visual_tests/images/text-allow-overlap-expr-500-500-2.0-agg-reference.png
new file mode 100644
index 000000000..bb01c5bfb
Binary files /dev/null and b/tests/visual_tests/images/text-allow-overlap-expr-500-500-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/text-allow-overlap-expr-500-500-2.0-cairo-reference.png b/tests/visual_tests/images/text-allow-overlap-expr-500-500-2.0-cairo-reference.png
new file mode 100644
index 000000000..5b69fdfd2
Binary files /dev/null and b/tests/visual_tests/images/text-allow-overlap-expr-500-500-2.0-cairo-reference.png differ
diff --git a/tests/visual_tests/styles/point-symbolizer-overlap-placement-expr.xml b/tests/visual_tests/styles/point-symbolizer-overlap-placement-expr.xml
new file mode 100644
index 000000000..e39d56ea2
--- /dev/null
+++ b/tests/visual_tests/styles/point-symbolizer-overlap-placement-expr.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Map>
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <FontSet name="book">
+    <Font face-name="DejaVu Sans Book"/>
+  </FontSet>
+
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <StyleName>My Style</StyleName>
+    <Datasource>
+      <Parameter name="type">csv</Parameter>
+<Parameter name="inline">
+lat,long,overlap,placement
+ 0.33,-0.36,noexpr-true,noexpr-false
+ 0.33,-0.34,noexpr-true,noexpr-false
+ 0.33,-0.13,noexpr-false,noexpr-false
+ 0.33,-0.11,noexpr-false,noexpr-false
+ 0.33, 0.10,noexpr-true,noexpr-false
+ 0.33, 0.12,noexpr-false,noexpr-false
+ 0.33, 0.34,noexpr-false,noexpr-false
+ 0.33, 0.36,noexpr-true,noexpr-false
+
+ 0.11,-0.36,true,false
+ 0.11,-0.34,true,false
+ 0.11,-0.13,false,false
+ 0.11,-0.11,false,false
+ 0.11, 0.10,true,false
+ 0.11, 0.12,false,false
+ 0.11, 0.34,false,false
+ 0.11, 0.36,true,false
+
+-0.11,-0.36,noexpr-false,noexpr-true
+-0.11,-0.34,noexpr-false,noexpr-true
+-0.11,-0.13,noexpr-false,noexpr-false
+-0.11,-0.11,noexpr-false,noexpr-false
+-0.11, 0.10,noexpr-false,noexpr-true
+-0.11, 0.12,noexpr-false,noexpr-false
+-0.11, 0.34,noexpr-false,noexpr-false
+-0.11, 0.36,noexpr-false,noexpr-true
+
+-0.33,-0.36,false,true
+-0.33,-0.34,false,true
+-0.33,-0.13,false,false
+-0.33,-0.11,false,false
+-0.33, 0.10,false,true
+-0.33, 0.12,false,false
+-0.33, 0.34,false,false
+-0.33, 0.36,false,true
+      </Parameter>
+    </Datasource>
+  </Layer>
+
+    <Style name="My Style" filter-mode="first">
+    <Rule>
+      <Filter>[overlap] = "noexpr-true" and [placement] = "noexpr-true"</Filter>
+      <PointSymbolizer allow-overlap="true" ignore-placement="true" file="../../data/svg/point_sm.svg" />
+    </Rule>
+    <Rule>
+      <Filter>[overlap] = "noexpr-true" and [placement] = "noexpr-false"</Filter>
+      <PointSymbolizer allow-overlap="true" ignore-placement="false" file="../../data/svg/point_sm.svg" />
+    </Rule>
+    <Rule>
+      <Filter>[overlap] = "noexpr-false" and [placement] = "noexpr-false"</Filter>
+      <PointSymbolizer allow-overlap="false" ignore-placement="false" file="../../data/svg/point_sm.svg" />
+    </Rule>
+    <Rule>
+      <Filter>[overlap] = "noexpr-false" and [placement] = "noexpr-true"</Filter>
+      <PointSymbolizer allow-overlap="false" ignore-placement="true" file="../../data/svg/point_sm.svg" />
+    </Rule>
+    <Rule>
+      <PointSymbolizer allow-overlap="[overlap]" ignore-placement="[placement]" file="../../data/svg/point_sm.svg" />
+    </Rule>
+  </Style>
+
+</Map>
diff --git a/tests/visual_tests/styles/text-allow-overlap-expr.xml b/tests/visual_tests/styles/text-allow-overlap-expr.xml
new file mode 100644
index 000000000..ee85083da
--- /dev/null
+++ b/tests/visual_tests/styles/text-allow-overlap-expr.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Map>
+<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+  <FontSet name="book">
+    <Font face-name="DejaVu Sans Book"/>
+  </FontSet>
+
+  <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <StyleName>My Style</StyleName>
+    <Datasource>
+      <Parameter name="type">csv</Parameter>
+<Parameter name="inline">
+lat,long,test,text
+ 0.25,-0.35,noexpr-true,ABC
+ 0.25,-0.35,noexpr-true,XYZ
+ 0.25,-0.12,noexpr-false,ABC
+ 0.25,-0.12,noexpr-false,XYZ
+ 0.25, 0.11,noexpr-true,ABC
+ 0.25, 0.11,noexpr-false,XYZ
+ 0.25, 0.35,noexpr-false,ABC
+ 0.25, 0.35,noexpr-true,XYZ
+ 0   ,-0.35,true,ABC
+ 0   ,-0.35,true,XYZ
+ 0   ,-0.12,false,ABC
+ 0   ,-0.12,false,XYZ
+ 0   , 0.11,true,ABC
+ 0   , 0.11,false,XYZ
+ 0   , 0.35,false,ABC
+ 0   , 0.35,true,XYZ
+      </Parameter>
+    </Datasource>
+  </Layer>
+
+    <Style name="My Style" filter-mode="first">
+    <Rule>
+      <Filter>[test] = "noexpr-true"</Filter>
+      <TextSymbolizer fontset-name="book" size="16" placement="point" dx="0" dy="0" allow-overlap="true">[text]</TextSymbolizer>
+    </Rule>
+    <Rule>
+      <Filter>[test] = "noexpr-false"</Filter>
+      <TextSymbolizer fontset-name="book" size="16" placement="point" dx="0" dy="0" allow-overlap="false">[text]</TextSymbolizer>
+    </Rule>
+    <Rule>
+      <TextSymbolizer fontset-name="book" size="16" placement="point" dx="0" dy="0" allow-overlap="[test]">[text]</TextSymbolizer>
+    </Rule>
+  </Style>
+
+</Map>
diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py
index da095b1b8..6759d395d 100755
--- a/tests/visual_tests/test.py
+++ b/tests/visual_tests/test.py
@@ -247,6 +247,7 @@ files = {
     'line-symbolizer-expressions-all':{'sizes':[(256,256)]},
     'point-symbolizer-expressions':{'sizes':[(256,256)]},
     'point-symbolizer-expressions-all':{'sizes':[(256,256)]},
+    'point-symbolizer-overlap-placement-expr': {'bbox':large_text_box, 'sizes': [(500, 500)]},
     'marker-symbolizer-expressions-all':{'sizes':[(256,256)]},
     'polygon-symbolizer-expressions':{'sizes':[(256,256)]},
     'polygon-symbolizer-expressions-all':{'sizes':[(256,256)]},