diff --git a/test/integration/render-tests/icon-size/default/expected.png b/test/integration/render-tests/icon-size/default/expected.png
index b557018d6ca..84e10d3bf39 100644
Binary files a/test/integration/render-tests/icon-size/default/expected.png and b/test/integration/render-tests/icon-size/default/expected.png differ
diff --git a/test/integration/render-tests/icon-size/default/style.json b/test/integration/render-tests/icon-size/default/style.json
index 6db45c7b36b..80070cc9391 100644
--- a/test/integration/render-tests/icon-size/default/style.json
+++ b/test/integration/render-tests/icon-size/default/style.json
@@ -2,51 +2,31 @@
   "version": 8,
   "metadata": {
     "test": {
-      "height": 256
+      "width": 64,
+      "height": 64
     }
   },
-  "center": [
-    13.418056,
-    52.499167
-  ],
-  "zoom": 14,
   "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "Point",
+        "coordinates": [
+          0,
+          0
+        ]
+      }
     }
   },
   "sprite": "local://sprites/emerald",
   "layers": [
     {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "icon-default",
+      "id": "symbol",
       "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "poi_label",
-      "filter": [
-        "==",
-        "maki",
-        "restaurant"
-      ],
+      "source": "geojson",
       "layout": {
-        "symbol-placement": "point",
-        "icon-allow-overlap": true,
-        "icon-ignore-placement": true,
         "icon-image": "generic_icon"
-      },
-      "paint": {
-        "icon-opacity": 1
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/test/integration/render-tests/icon-size/function/expected.png b/test/integration/render-tests/icon-size/function/expected.png
index 772999d7e4e..478618f2690 100644
Binary files a/test/integration/render-tests/icon-size/function/expected.png and b/test/integration/render-tests/icon-size/function/expected.png differ
diff --git a/test/integration/render-tests/icon-size/function/style.json b/test/integration/render-tests/icon-size/function/style.json
index 6b466edbba7..b87cae8ee93 100644
--- a/test/integration/render-tests/icon-size/function/style.json
+++ b/test/integration/render-tests/icon-size/function/style.json
@@ -2,63 +2,44 @@
   "version": 8,
   "metadata": {
     "test": {
-      "height": 256
+      "width": 64,
+      "height": 64
     }
   },
-  "center": [
-    13.418056,
-    52.499167
-  ],
-  "zoom": 14,
+  "zoom": 0.5,
   "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "Point",
+        "coordinates": [
+          0,
+          0
+        ]
+      }
     }
   },
   "sprite": "local://sprites/emerald",
   "layers": [
     {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "icon-function",
+      "id": "symbol",
       "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "poi_label",
-      "filter": [
-        "==",
-        "maki",
-        "restaurant"
-      ],
+      "source": "geojson",
       "layout": {
-        "symbol-placement": "point",
-        "icon-allow-overlap": true,
-        "icon-ignore-placement": true,
         "icon-image": "generic_icon",
         "icon-size": {
           "stops": [
             [
-              16,
-              4
+              0,
+              1
             ],
             [
-              17,
-              5
+              1,
+              2
             ]
           ]
         }
-      },
-      "paint": {
-        "icon-opacity": 1
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/test/integration/render-tests/icon-size/literal/expected.png b/test/integration/render-tests/icon-size/literal/expected.png
index 8bea7dffc6e..a5bf2aa7248 100644
Binary files a/test/integration/render-tests/icon-size/literal/expected.png and b/test/integration/render-tests/icon-size/literal/expected.png differ
diff --git a/test/integration/render-tests/icon-size/literal/style.json b/test/integration/render-tests/icon-size/literal/style.json
index b0c24854bf1..31a42a59e2e 100644
--- a/test/integration/render-tests/icon-size/literal/style.json
+++ b/test/integration/render-tests/icon-size/literal/style.json
@@ -2,52 +2,32 @@
   "version": 8,
   "metadata": {
     "test": {
-      "height": 256
+      "width": 64,
+      "height": 64
     }
   },
-  "center": [
-    13.418056,
-    52.499167
-  ],
-  "zoom": 14,
   "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "Point",
+        "coordinates": [
+          0,
+          0
+        ]
+      }
     }
   },
   "sprite": "local://sprites/emerald",
   "layers": [
     {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "icon-literal",
+      "id": "symbol",
       "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "poi_label",
-      "filter": [
-        "==",
-        "maki",
-        "restaurant"
-      ],
+      "source": "geojson",
       "layout": {
-        "symbol-placement": "point",
-        "icon-allow-overlap": true,
-        "icon-ignore-placement": true,
         "icon-image": "generic_icon",
         "icon-size": 2
-      },
-      "paint": {
-        "icon-opacity": 1
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/test/integration/render-tests/text-size/default/expected.png b/test/integration/render-tests/text-size/default/expected.png
index 745108663f0..c1edcff68a7 100644
Binary files a/test/integration/render-tests/text-size/default/expected.png and b/test/integration/render-tests/text-size/default/expected.png differ
diff --git a/test/integration/render-tests/text-size/default/style.json b/test/integration/render-tests/text-size/default/style.json
index a760364a32f..834beb75aae 100644
--- a/test/integration/render-tests/text-size/default/style.json
+++ b/test/integration/render-tests/text-size/default/style.json
@@ -2,55 +2,35 @@
   "version": 8,
   "metadata": {
     "test": {
-      "height": 256
+      "width": 64,
+      "height": 64
     }
   },
-  "center": [
-    13.418056,
-    52.499167
-  ],
-  "zoom": 14,
   "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "Point",
+        "coordinates": [
+          0,
+          0
+        ]
+      }
     }
   },
   "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
   "layers": [
     {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "text",
+      "id": "symbol",
       "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "poi_label",
-      "filter": [
-        "==",
-        "maki",
-        "restaurant"
-      ],
+      "source": "geojson",
       "layout": {
-        "symbol-placement": "point",
-        "text-allow-overlap": true,
-        "text-ignore-placement": true,
-        "text-field": "Test",
+        "text-field": "ABC",
         "text-font": [
           "Open Sans Semibold",
           "Arial Unicode MS Bold"
         ]
-      },
-      "paint": {
-        "text-opacity": 1
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/test/integration/render-tests/text-size/function/expected.png b/test/integration/render-tests/text-size/function/expected.png
index 91e61ed911e..5df868f5e23 100644
Binary files a/test/integration/render-tests/text-size/function/expected.png and b/test/integration/render-tests/text-size/function/expected.png differ
diff --git a/test/integration/render-tests/text-size/function/style.json b/test/integration/render-tests/text-size/function/style.json
index 4d9ef12f54f..996d79dbef3 100644
--- a/test/integration/render-tests/text-size/function/style.json
+++ b/test/integration/render-tests/text-size/function/style.json
@@ -2,47 +2,31 @@
   "version": 8,
   "metadata": {
     "test": {
-      "height": 256
+      "width": 64,
+      "height": 64
     }
   },
-  "center": [
-    13.418056,
-    52.499167
-  ],
-  "zoom": 14,
+  "zoom": 0.5,
   "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "Point",
+        "coordinates": [
+          0,
+          0
+        ]
+      }
     }
   },
   "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
   "layers": [
     {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "text-function",
+      "id": "symbol",
       "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "poi_label",
-      "filter": [
-        "==",
-        "maki",
-        "restaurant"
-      ],
+      "source": "geojson",
       "layout": {
-        "symbol-placement": "point",
-        "text-allow-overlap": true,
-        "text-ignore-placement": true,
-        "text-field": "Test",
+        "text-field": "ABC",
         "text-font": [
           "Open Sans Semibold",
           "Arial Unicode MS Bold"
@@ -50,19 +34,16 @@
         "text-size": {
           "stops": [
             [
-              16,
-              14
+              0,
+              12
             ],
             [
-              17,
-              16
+              1,
+              24
             ]
           ]
         }
-      },
-      "paint": {
-        "text-opacity": 1
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/test/integration/render-tests/text-size/literal/expected.png b/test/integration/render-tests/text-size/literal/expected.png
index 5c85a3df2b9..aba8e806a61 100644
Binary files a/test/integration/render-tests/text-size/literal/expected.png and b/test/integration/render-tests/text-size/literal/expected.png differ
diff --git a/test/integration/render-tests/text-size/literal/style.json b/test/integration/render-tests/text-size/literal/style.json
index 586705cf53e..f743eb6f8e9 100644
--- a/test/integration/render-tests/text-size/literal/style.json
+++ b/test/integration/render-tests/text-size/literal/style.json
@@ -2,56 +2,36 @@
   "version": 8,
   "metadata": {
     "test": {
-      "height": 256
+      "width": 64,
+      "height": 64
     }
   },
-  "center": [
-    13.418056,
-    52.499167
-  ],
-  "zoom": 14,
   "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "Point",
+        "coordinates": [
+          0,
+          0
+        ]
+      }
     }
   },
   "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
   "layers": [
     {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "text-literal",
+      "id": "symbol",
       "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "poi_label",
-      "filter": [
-        "==",
-        "maki",
-        "restaurant"
-      ],
+      "source": "geojson",
       "layout": {
-        "symbol-placement": "point",
-        "text-allow-overlap": true,
-        "text-ignore-placement": true,
-        "text-field": "Test",
+        "text-field": "ABC",
         "text-font": [
           "Open Sans Semibold",
           "Arial Unicode MS Bold"
         ],
-        "text-size": 10
-      },
-      "paint": {
-        "text-opacity": 1
+        "text-size": 24
       }
     }
   ]
-}
\ No newline at end of file
+}