diff --git a/test/integration/render-tests/linear-filter-opacity-edge/literal/expected.png b/test/integration/render-tests/linear-filter-opacity-edge/literal/expected.png
deleted file mode 100644
index 1ca3c162898..00000000000
Binary files a/test/integration/render-tests/linear-filter-opacity-edge/literal/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/linear-filter-opacity-edge/literal/style.json b/test/integration/render-tests/linear-filter-opacity-edge/literal/style.json
deleted file mode 100644
index 56cc0544462..00000000000
--- a/test/integration/render-tests/linear-filter-opacity-edge/literal/style.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "height": 256
-    }
-  },
-  "center": [
-    13.418056,
-    52.499167
-  ],
-  "zoom": 14,
-  "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
-    }
-  },
-  "sprite": "local://sprites/sprite",
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "icon",
-      "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "poi_label",
-      "filter": [
-        "==",
-        "maki",
-        "restaurant"
-      ],
-      "layout": {
-        "symbol-placement": "point",
-        "icon-allow-overlap": true,
-        "icon-ignore-placement": true,
-        "icon-size": 3,
-        "icon-image": "squares-18"
-      },
-      "paint": {}
-    }
-  ]
-}
\ No newline at end of file
diff --git a/test/integration/render-tests/map-mode/static/expected.png b/test/integration/render-tests/map-mode/static/expected.png
deleted file mode 100644
index c68b54da9e0..00000000000
Binary files a/test/integration/render-tests/map-mode/static/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/map-mode/static/style.json b/test/integration/render-tests/map-mode/static/style.json
deleted file mode 100644
index adacc7db9eb..00000000000
--- a/test/integration/render-tests/map-mode/static/style.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "mapMode": "static",
-      "height": 512,
-      "width": 512
-    }
-  },
-  "center": [
-      13.414306640625,
-      52.502847659403955
-  ],
-  "zoom": 14,
-  "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
-    }
-  },
-  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "text",
-      "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "poi_label",
-      "filter": [
-        "==",
-        "maki",
-        "restaurant"
-      ],
-      "layout": {
-        "symbol-placement": "point",
-        "text-allow-overlap": true,
-        "text-ignore-placement": true,
-        "text-field": "A B C D\nE F G H",
-        "text-font": [
-          "Open Sans Semibold",
-          "Arial Unicode MS Bold"
-        ]
-      },
-      "paint": {}
-    }
-  ]
-}
diff --git a/test/integration/render-tests/map-mode/tile-avoid-edges/expected.png b/test/integration/render-tests/map-mode/tile-avoid-edges/expected.png
deleted file mode 100644
index 39d3ebcd40c..00000000000
Binary files a/test/integration/render-tests/map-mode/tile-avoid-edges/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/map-mode/tile-avoid-edges/style.json b/test/integration/render-tests/map-mode/tile-avoid-edges/style.json
deleted file mode 100644
index cdd829e7c5f..00000000000
--- a/test/integration/render-tests/map-mode/tile-avoid-edges/style.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "mapMode": "tile",
-      "collisionDebug": true,
-      "debug": true,
-      "width": 512,
-      "height": 512,
-      "operations": [
-        ["setStyle", "local://styles/chicago.json"],
-        ["setZoom", 13 ],
-        ["setCenter", [-87.7442445, 41.8403965] ],
-        ["wait"]
-      ]
-    }
-  },
-  "sources": {},
-  "layers": []
-}
diff --git a/test/integration/render-tests/map-mode/tile/expected.png b/test/integration/render-tests/map-mode/tile/expected.png
deleted file mode 100644
index 7697b012d26..00000000000
Binary files a/test/integration/render-tests/map-mode/tile/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/map-mode/tile/style.json b/test/integration/render-tests/map-mode/tile/style.json
deleted file mode 100644
index 5f8d0287c04..00000000000
--- a/test/integration/render-tests/map-mode/tile/style.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "mapMode": "tile",
-      "height": 512,
-      "width": 512
-    }
-  },
-  "center": [
-      13.414306640625,
-      52.502847659403955
-  ],
-  "zoom": 14,
-  "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
-    }
-  },
-  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "text",
-      "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "poi_label",
-      "filter": [
-        "==",
-        "maki",
-        "restaurant"
-      ],
-      "layout": {
-        "symbol-placement": "point",
-        "text-allow-overlap": true,
-        "text-ignore-placement": true,
-        "text-field": "A B C D\nE F G H",
-        "text-font": [
-          "Open Sans Semibold",
-          "Arial Unicode MS Bold"
-        ]
-      },
-      "paint": {}
-    }
-  ]
-}
diff --git a/test/integration/render-tests/map-projections/albers-usa/expected.png b/test/integration/render-tests/map-projections/albers-usa/expected.png
new file mode 100644
index 00000000000..e87db63d370
Binary files /dev/null and b/test/integration/render-tests/map-projections/albers-usa/expected.png differ
diff --git a/test/integration/render-tests/map-projections/albers-usa/style.json b/test/integration/render-tests/map-projections/albers-usa/style.json
new file mode 100644
index 00000000000..c362e187d70
--- /dev/null
+++ b/test/integration/render-tests/map-projections/albers-usa/style.json
@@ -0,0 +1,16 @@
+{
+    "version": 8,
+    "metadata": {
+      "test": {
+        "projection": "albers",
+        "width": 512,
+        "height": 512,
+        "operations": [
+          ["setStyle", "local://mapbox-gl-styles/styles/basic-v9.json"],
+          ["wait"]
+        ]
+      }
+    },
+    "sources": {},
+    "layers": []
+  }
\ No newline at end of file
diff --git a/test/integration/render-tests/mixed-zoom/z10-z11/expected.png b/test/integration/render-tests/mixed-zoom/z10-z11/expected.png
deleted file mode 100644
index 6f20dd1e182..00000000000
Binary files a/test/integration/render-tests/mixed-zoom/z10-z11/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/mixed-zoom/z10-z11/style.json b/test/integration/render-tests/mixed-zoom/z10-z11/style.json
deleted file mode 100644
index e8576af0384..00000000000
--- a/test/integration/render-tests/mixed-zoom/z10-z11/style.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-        "test": {
-            "width": 512,
-            "height": 512,
-            "debug": true,
-            "collisionDebug": true,
-            "operations": [
-              ["setStyle", "local://mapbox-gl-styles/styles/basic-v9.json"],
-              ["wait"],
-              ["setZoom", 11.1],
-              ["sleep", 3000]
-            ]
-        }
-    },
-    "center": [
-        -118.303,
-        33.908
-    ],
-    "zoom": 10.5,
-    "sources": {},
-    "layers": []
-}
diff --git a/test/integration/render-tests/projection/axonometric-multiple/expected.png b/test/integration/render-tests/projection/axonometric-multiple/expected.png
deleted file mode 100644
index bb57972e27c..00000000000
Binary files a/test/integration/render-tests/projection/axonometric-multiple/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/projection/axonometric-multiple/style.json b/test/integration/render-tests/projection/axonometric-multiple/style.json
deleted file mode 100644
index ec1bb76ad8c..00000000000
--- a/test/integration/render-tests/projection/axonometric-multiple/style.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "axonometric": true,
-      "height": 256,
-      "allowed": 0.0005
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "FeatureCollection",
-        "features": [
-          {
-            "type": "Feature",
-            "properties": {
-              "which": "a",
-              "property": 10
-            },
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    -0.0003,
-                    -0.0003
-                  ],
-                  [
-                    -0.0003,
-                    0.0003
-                  ],
-                  [
-                    0.0003,
-                    0.0003
-                  ],
-                  [
-                    0.0003,
-                    -0.0003
-                  ],
-                  [
-                    -0.0003,
-                    -0.0003
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {
-              "which": "b",
-              "property": 20
-            },
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    -0.0002,
-                    0
-                  ],
-                  [
-                    0,
-                    0.0002
-                  ],
-                  [
-                    0.0002,
-                    0
-                  ],
-                  [
-                    0,
-                    -0.0002
-                  ],
-                  [
-                    -0.0002,
-                    0
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {
-              "which": "c",
-              "property": 30
-            },
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    -0.00008,
-                    -0.00008
-                  ],
-                  [
-                    -0.00008,
-                    0.00008
-                  ],
-                  [
-                    0.00008,
-                    0.00008
-                  ],
-                  [
-                    0.00008,
-                    -0.00008
-                  ],
-                  [
-                    -0.00008,
-                    -0.00008
-                  ]
-                ]
-              ]
-            }
-          }
-        ]
-      }
-    }
-  },
-  "pitch": 60,
-  "zoom": 18,
-  "layers": [
-    {
-      "id": "a",
-      "type": "fill-extrusion",
-      "source": "geojson",
-      "filter": ["==", "which", "a"],
-      "paint": {
-        "fill-extrusion-color": "red",
-        "fill-extrusion-height": 10
-      }
-    },
-    {
-      "id": "b",
-      "type": "fill-extrusion",
-      "source": "geojson",
-      "filter": ["==", "which", "b"],
-      "paint": {
-        "fill-extrusion-color": "blue",
-        "fill-extrusion-height": 20
-      }
-    },
-    {
-      "id": "c",
-      "type": "fill-extrusion",
-      "source": "geojson",
-      "filter": ["==", "which", "c"],
-      "paint": {
-        "fill-extrusion-color": "yellow",
-        "fill-extrusion-height": 30
-      }
-    }
-  ]
-}
diff --git a/test/integration/render-tests/projection/axonometric/expected.png b/test/integration/render-tests/projection/axonometric/expected.png
deleted file mode 100644
index 406e5bc59c1..00000000000
Binary files a/test/integration/render-tests/projection/axonometric/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/projection/axonometric/style.json b/test/integration/render-tests/projection/axonometric/style.json
deleted file mode 100644
index 3e5a1550336..00000000000
--- a/test/integration/render-tests/projection/axonometric/style.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "axonometric": true
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "FeatureCollection",
-        "features": [
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    -0.0003,
-                    -0.0003
-                  ],
-                  [
-                    -0.0004,
-                    -0.0003
-                  ],
-                  [
-                    -0.0004,
-                    -0.0004
-                  ],
-                  [
-                    -0.0003,
-                    -0.0004
-                  ],
-                  [
-                    -0.0003,
-                    -0.0003
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    0.0003,
-                    0.0003
-                  ],
-                  [
-                    0.0004,
-                    0.0003
-                  ],
-                  [
-                    0.0004,
-                    0.0004
-                  ],
-                  [
-                    0.0003,
-                    0.0004
-                  ],
-                  [
-                    0.0003,
-                    0.0003
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    0.0003,
-                    -0.0003
-                  ],
-                  [
-                    0.0004,
-                    -0.0003
-                  ],
-                  [
-                    0.0004,
-                    -0.0004
-                  ],
-                  [
-                    0.0003,
-                    -0.0004
-                  ],
-                  [
-                    0.0003,
-                    -0.0003
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    -0.0003,
-                    0.0003
-                  ],
-                  [
-                    -0.0004,
-                    0.0003
-                  ],
-                  [
-                    -0.0004,
-                    0.0004
-                  ],
-                  [
-                    -0.0003,
-                    0.0004
-                  ],
-                  [
-                    -0.0003,
-                    0.0003
-                  ]
-                ]
-              ]
-            }
-          }
-        ]
-      }
-    }
-  },
-  "zoom": 18,
-  "layers": [
-    {
-      "id": "extrusion",
-      "type": "fill-extrusion",
-      "source": "geojson",
-      "paint": {
-        "fill-extrusion-height": 100,
-        "fill-extrusion-color": "red"
-      }
-    }
-  ]
-}
diff --git a/test/integration/render-tests/projection/perspective/expected.png b/test/integration/render-tests/projection/perspective/expected.png
deleted file mode 100644
index 9f38cb37ba5..00000000000
Binary files a/test/integration/render-tests/projection/perspective/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/projection/perspective/style.json b/test/integration/render-tests/projection/perspective/style.json
deleted file mode 100644
index 831d3575802..00000000000
--- a/test/integration/render-tests/projection/perspective/style.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "axonometric": false,
-      "allowed": 0.00075
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "FeatureCollection",
-        "features": [
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    -0.0003,
-                    -0.0003
-                  ],
-                  [
-                    -0.0004,
-                    -0.0003
-                  ],
-                  [
-                    -0.0004,
-                    -0.0004
-                  ],
-                  [
-                    -0.0003,
-                    -0.0004
-                  ],
-                  [
-                    -0.0003,
-                    -0.0003
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    0.0003,
-                    0.0003
-                  ],
-                  [
-                    0.0004,
-                    0.0003
-                  ],
-                  [
-                    0.0004,
-                    0.0004
-                  ],
-                  [
-                    0.0003,
-                    0.0004
-                  ],
-                  [
-                    0.0003,
-                    0.0003
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    0.0003,
-                    -0.0003
-                  ],
-                  [
-                    0.0004,
-                    -0.0003
-                  ],
-                  [
-                    0.0004,
-                    -0.0004
-                  ],
-                  [
-                    0.0003,
-                    -0.0004
-                  ],
-                  [
-                    0.0003,
-                    -0.0003
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    -0.0003,
-                    0.0003
-                  ],
-                  [
-                    -0.0004,
-                    0.0003
-                  ],
-                  [
-                    -0.0004,
-                    0.0004
-                  ],
-                  [
-                    -0.0003,
-                    0.0004
-                  ],
-                  [
-                    -0.0003,
-                    0.0003
-                  ]
-                ]
-              ]
-            }
-          }
-        ]
-      }
-    }
-  },
-  "zoom": 18,
-  "layers": [
-    {
-      "id": "extrusion",
-      "type": "fill-extrusion",
-      "source": "geojson",
-      "paint": {
-        "fill-extrusion-height": 100,
-        "fill-extrusion-color": "red"
-      }
-    }
-  ]
-}
diff --git a/test/integration/render-tests/projection/skew/expected.png b/test/integration/render-tests/projection/skew/expected.png
deleted file mode 100644
index 0f4e759b9f6..00000000000
Binary files a/test/integration/render-tests/projection/skew/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/projection/skew/style.json b/test/integration/render-tests/projection/skew/style.json
deleted file mode 100644
index 3094c2bc067..00000000000
--- a/test/integration/render-tests/projection/skew/style.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "axonometric": true,
-      "skew": [-1, -1]
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "FeatureCollection",
-        "features": [
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    -0.0003,
-                    -0.0003
-                  ],
-                  [
-                    -0.0004,
-                    -0.0003
-                  ],
-                  [
-                    -0.0004,
-                    -0.0004
-                  ],
-                  [
-                    -0.0003,
-                    -0.0004
-                  ],
-                  [
-                    -0.0003,
-                    -0.0003
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    0.0003,
-                    0.0003
-                  ],
-                  [
-                    0.0004,
-                    0.0003
-                  ],
-                  [
-                    0.0004,
-                    0.0004
-                  ],
-                  [
-                    0.0003,
-                    0.0004
-                  ],
-                  [
-                    0.0003,
-                    0.0003
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    0.0003,
-                    -0.0003
-                  ],
-                  [
-                    0.0004,
-                    -0.0003
-                  ],
-                  [
-                    0.0004,
-                    -0.0004
-                  ],
-                  [
-                    0.0003,
-                    -0.0004
-                  ],
-                  [
-                    0.0003,
-                    -0.0003
-                  ]
-                ]
-              ]
-            }
-          },
-          {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-              "type": "Polygon",
-              "coordinates": [
-                [
-                  [
-                    -0.0003,
-                    0.0003
-                  ],
-                  [
-                    -0.0004,
-                    0.0003
-                  ],
-                  [
-                    -0.0004,
-                    0.0004
-                  ],
-                  [
-                    -0.0003,
-                    0.0004
-                  ],
-                  [
-                    -0.0003,
-                    0.0003
-                  ]
-                ]
-              ]
-            }
-          }
-        ]
-      }
-    }
-  },
-  "zoom": 18,
-  "layers": [
-    {
-      "id": "extrusion",
-      "type": "fill-extrusion",
-      "source": "geojson",
-      "paint": {
-        "fill-extrusion-height": 100,
-        "fill-extrusion-color": "red"
-      }
-    }
-  ]
-}
diff --git a/test/integration/render-tests/raster-alpha/default/expected.png b/test/integration/render-tests/raster-alpha/default/expected.png
deleted file mode 100644
index 91bad78ad4e..00000000000
Binary files a/test/integration/render-tests/raster-alpha/default/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/raster-alpha/default/style.json b/test/integration/render-tests/raster-alpha/default/style.json
deleted file mode 100644
index 8d3ccbb5877..00000000000
--- a/test/integration/render-tests/raster-alpha/default/style.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "height": 256
-    }
-  },
-  "center": [
-    52.499167,
-    13.418056
-  ],
-  "zoom": 16,
-  "sources": {
-    "source": {
-      "type": "raster",
-      "tiles": [
-        "local://tiles/alpha.png"
-      ],
-      "maxzoom": 17,
-      "tileSize": 256
-    }
-  },
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "orange"
-      }
-    },
-    {
-      "id": "raster",
-      "type": "raster",
-      "source": "source",
-      "paint": {
-        "raster-fade-duration": 0
-      }
-    }
-  ]
-}
\ No newline at end of file