diff --git a/test/integration/render-tests/icon-size/property-function-plain/expected.png b/test/integration/render-tests/icon-size/property-function-plain/expected.png
new file mode 100644
index 00000000000..fddea5c7108
Binary files /dev/null and b/test/integration/render-tests/icon-size/property-function-plain/expected.png differ
diff --git a/test/integration/render-tests/icon-size/property-function-plain/style.json b/test/integration/render-tests/icon-size/property-function-plain/style.json
new file mode 100644
index 00000000000..1dafa6d26e8
--- /dev/null
+++ b/test/integration/render-tests/icon-size/property-function-plain/style.json
@@ -0,0 +1,66 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": { "x": 0 },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [ -10, 0 ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": { "x": 5 },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [
+                10,
+                0
+              ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "sprite": "local://sprites/sprite",
+  "layers": [
+    {
+      "id": "symbol",
+      "type": "symbol",
+      "source": "geojson",
+      "layout": {
+        "icon-size": {
+          "property": "x",
+          "stops": [
+            [
+              0,
+              0.5
+            ],
+            [
+              10,
+              1.5
+            ]
+          ]
+        },
+        "icon-image": "restaurant-12"
+      },
+      "paint": {
+        "icon-color": "red"
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/text-size/composite-function-line-placement/expected.png b/test/integration/render-tests/text-size/composite-function-line-placement/expected.png
new file mode 100644
index 00000000000..42656388d95
Binary files /dev/null and b/test/integration/render-tests/text-size/composite-function-line-placement/expected.png differ
diff --git a/test/integration/render-tests/text-size/composite-function-line-placement/style.json b/test/integration/render-tests/text-size/composite-function-line-placement/style.json
new file mode 100644
index 00000000000..d0a797a43fb
--- /dev/null
+++ b/test/integration/render-tests/text-size/composite-function-line-placement/style.json
@@ -0,0 +1,62 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64
+    }
+  },
+  "zoom": 2.75,
+  "center": [-20, -10],
+  "sources": {
+    "geojson": {
+      "type":"geojson",
+      "data":{
+        "type":"FeatureCollection",
+        "features": [{
+          "type":"Feature",
+          "properties":{"x":0},
+          "geometry":{
+            "type":"LineString","coordinates":[
+              [-10,-1], [-20,-10], [-30,-1], [-40,-10]]
+          }
+        }]
+      }
+    }
+  },
+  "layers":[
+    {
+      "id": "symbol-camera",
+      "type": "symbol",
+      "source": "geojson",
+      "layout": {
+        "symbol-placement": "line",
+        "symbol-spacing": 1,
+        "text-anchor": "left",
+        "text-allow-overlap": true,
+        "text-ignore-placement": true,
+        "text-max-angle": 180,
+        "text-field": "abcdefghijklmnopqrstuvwxyz",
+        "text-font": [
+          "Open Sans Semibold",
+          "Arial Unicode MS Bold"
+        ],
+        "text-size": {
+          "property": "x",
+          "stops": [
+            [ {"value": 0, "zoom": 0}, 2 ],
+            [ {"value": 0, "zoom": 1}, 4 ],
+            [ {"value": 0, "zoom": 2}, 6 ],
+            [ {"value": 0, "zoom": 3}, 12 ],
+            [ {"value": 0, "zoom": 10}, 12 ]
+          ]
+        }
+      },
+      "paint": {
+        "text-color": "red",
+        "text-opacity": 0.5
+      }
+    }
+  ],
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf"
+}
diff --git a/test/integration/render-tests/text-size/composite-function/expected.png b/test/integration/render-tests/text-size/composite-function/expected.png
new file mode 100644
index 00000000000..8cdfd768141
Binary files /dev/null and b/test/integration/render-tests/text-size/composite-function/expected.png differ
diff --git a/test/integration/render-tests/text-size/composite-function/style.json b/test/integration/render-tests/text-size/composite-function/style.json
new file mode 100644
index 00000000000..1185d149f41
--- /dev/null
+++ b/test/integration/render-tests/text-size/composite-function/style.json
@@ -0,0 +1,63 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64
+    }
+  },
+  "zoom": 0.5,
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": { "x": 0 },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [ -10, 0 ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": { "x": 5 },
+            "geometry": {
+              "type": "Point",
+              "coordinates": [
+                10,
+                0
+              ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "symbol",
+      "type": "symbol",
+      "source": "geojson",
+      "layout": {
+        "text-field": "A",
+        "text-font": [
+          "Open Sans Semibold",
+          "Arial Unicode MS Bold"
+        ],
+        "text-size": {
+          "property": "x",
+          "stops": [
+            [ {"value": 0, "zoom": 0}, 10 ],
+            [ {"value": 10, "zoom": 0}, 20 ],
+            [ {"value": 0, "zoom": 1}, 14 ],
+            [ {"value": 10, "zoom": 1}, 28 ]
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/text-size/property-function/expected.png b/test/integration/render-tests/text-size/property-function/expected.png
index 5df868f5e23..822fbb21767 100644
Binary files a/test/integration/render-tests/text-size/property-function/expected.png and b/test/integration/render-tests/text-size/property-function/expected.png differ