diff --git a/tests/visual_tests/grids/text-font-features-500-500-1.0-grid-reference.json b/tests/visual_tests/grids/text-font-features-500-500-1.0-grid-reference.json
new file mode 100644
index 000000000..b03b4b9de
--- /dev/null
+++ b/tests/visual_tests/grids/text-font-features-500-500-1.0-grid-reference.json
@@ -0,0 +1,140 @@
+{
+ "keys": [
+  "", 
+  "1", 
+  "2", 
+  "3", 
+  "4", 
+  "5", 
+  "6", 
+  "7"
+ ], 
+ "data": {}, 
+ "grid": [
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                        !                          !       !!                                                ", 
+  "                                        !!   !!                !   !       !!    !  ! !  !                                   ", 
+  "                                   !!   !!   !!      !!!  !    !   !       !!   !!   !   !                                   ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                ###  #             #                       #  #                                              ", 
+  "                                 #    #   ##       #  #   ##   #   #       #      ##   ##   ##                               ", 
+  "                                 #        #        #           #   #       #      #    ##   #                                ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                          $    $   $                                                         ", 
+  "                                                       $$ $  $ $   $   $$$$                                                  ", 
+  "                                                  $$$$$$$ $$$$$$ $ $$$$$$$$                                                  ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                  %%%      %        %                                                        ", 
+  "                                                     % %% %% %%%%% %% %%%%%%                                                 ", 
+  "                                                             % %   %   %%%%                                                  ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                      & & &  & &   &   &                                                     ", 
+  "                                                      & &    && &    &&&                                                     ", 
+  "                                                      && &&  &&&&  &&  &                                                     ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                    ' ' ''''   '' ' '' ' '                                                   ", 
+  "                                                   '  '  ' ' ' ''''  '''  '                                                  ", 
+  "                                                   '  ' ''' '''''' '  '   '                                                  ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                        ( ((  ((  ( (                                                        ", 
+  "                                                        ( ( ( (((  (                                                         ", 
+  "                                                        ( ((( (( (( ((                                                       ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             "
+ ]
+}
\ No newline at end of file
diff --git a/tests/visual_tests/images/text-font-features-500-500-1.0-agg-reference.png b/tests/visual_tests/images/text-font-features-500-500-1.0-agg-reference.png
new file mode 100644
index 000000000..284ce3728
Binary files /dev/null and b/tests/visual_tests/images/text-font-features-500-500-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/text-font-features-500-500-1.0-cairo-reference.png b/tests/visual_tests/images/text-font-features-500-500-1.0-cairo-reference.png
new file mode 100644
index 000000000..7a73f16c9
Binary files /dev/null and b/tests/visual_tests/images/text-font-features-500-500-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/text-font-features-500-500-2.0-agg-reference.png b/tests/visual_tests/images/text-font-features-500-500-2.0-agg-reference.png
new file mode 100644
index 000000000..3d642d484
Binary files /dev/null and b/tests/visual_tests/images/text-font-features-500-500-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/text-font-features-500-500-2.0-cairo-reference.png b/tests/visual_tests/images/text-font-features-500-500-2.0-cairo-reference.png
new file mode 100644
index 000000000..ac397c651
Binary files /dev/null and b/tests/visual_tests/images/text-font-features-500-500-2.0-cairo-reference.png differ
diff --git a/tests/visual_tests/styles/text-font-features.xml b/tests/visual_tests/styles/text-font-features.xml
new file mode 100644
index 000000000..59c0147ba
--- /dev/null
+++ b/tests/visual_tests/styles/text-font-features.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Map>
+<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+
+    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+        <StyleName>My Style</StyleName>
+        <Datasource>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="extent">-1,-1,1,1</Parameter>
+            <Parameter name="inline">
+                id, lat, long, features, text, spacing
+                1,  0.6, 0, "", "The first floor", 10
+                2,  0.4, 0, "kern 0, liga 0", "The first floor", 10
+                3,  0.2, 0, "liga 1, dlig 1", "The first floor", 0
+                4,  0.0, 0, "smcp 1", "The first floor", 0
+                5, -0.2, 0, "frac 1, numr 1, dnom 1", "1⁄2 1⁄3 1⁄4", 0
+                6, -0.4, 0, "zero 1, onum 1", "0123456789", 0
+                7, -0.6, 0, "subs[1] 1, subs[4] 1", "H2SO4", 0
+            </Parameter>
+        </Datasource>
+    </Layer>
+    <Style name="My Style">
+        <Rule>
+            <TextSymbolizer
+                face-name="DejaVu Serif Book"
+                size="15"
+                placement="point"
+                character-spacing="[spacing]"
+                font-feature-settings="[features]"
+                >[text]</TextSymbolizer>
+        </Rule>
+    </Style>
+</Map>
diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py
index fe58bfea8..8b2b21443 100755
--- a/tests/visual_tests/test.py
+++ b/tests/visual_tests/test.py
@@ -181,6 +181,7 @@ files = {
     'text-halign': {'sizes': [(800,800)], 'bbox': default_text_box},
     'text-malayalam': {'sizes': [(800, 100)], 'bbox': default_text_box},
     'text-bengali': {'sizes': [(800, 100)], 'bbox': default_text_box},
+    'text-font-features': {'sizes': [(500, 500)]},
     'text-multi-layout-1': {'sizes': [(512,512)], 'bbox':mapnik.Box2d(-1, -1, 1, 1)},
     'text-multi-layout-2': {'sizes': [(512,512)], 'bbox':mapnik.Box2d(-1, -1, 1, 1)},
     'line-pattern-symbolizer': {'sizes':[(900, 250)],'bbox': mapnik.Box2d(-5.192, 50.189, -5.174, 50.195)},