diff --git a/package.json b/package.json
index b9fe5e25bdb..6c4372d249e 100644
--- a/package.json
+++ b/package.json
@@ -41,16 +41,18 @@
     "@mapbox/flow-remove-types": "^1.3.0-await.upstream.2",
     "@mapbox/gazetteer": "^4.0.4",
     "@mapbox/mapbox-gl-rtl-text": "^0.2.1",
-    "@mapbox/mapbox-gl-test-suite": "file:test/integration",
+    "@mapbox/mvt-fixtures": "^3.6.0",
     "@octokit/rest": "^16.30.1",
     "@rollup/plugin-strip": "^1.3.1",
     "address": "^1.1.2",
     "babel-eslint": "^10.0.1",
     "benchmark": "^2.1.4",
     "browserify": "^16.2.3",
+    "chalk": "^3.0.0",
     "chokidar": "^3.0.2",
     "cssnano": "^4.1.10",
     "d3": "^4.12.0",
+    "diff": "^4.0.1",
     "documentation": "~12.1.1",
     "ejs": "^2.5.7",
     "eslint": "^5.15.3",
@@ -68,11 +70,14 @@
     "jsdom": "^13.0.0",
     "json-stringify-pretty-compact": "^2.0.0",
     "jsonwebtoken": "^8.3.0",
+    "lodash.template": "^4.5.0",
+    "mapbox-gl-styles": "^2.0.2",
     "mock-geolocation": "^1.0.11",
     "node-notifier": "^5.4.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^13.3.0",
     "pirates": "^4.0.1",
+    "pixelmatch": "^5.1.0",
     "pngjs": "^3.4.0",
     "postcss-cli": "^6.1.2",
     "postcss-inline-svg": "^3.1.1",
@@ -91,6 +96,7 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "rollup-plugin-terser": "^5.1.2",
     "rollup-plugin-unassert": "^0.3.0",
+    "shuffle-seed": "^1.1.6",
     "sinon": "^7.3.2",
     "st": "^1.2.2",
     "stylelint": "^9.10.1",
diff --git a/test/integration/lib/harness.js b/test/integration/lib/harness.js
index d12cedc5773..dff138568b0 100644
--- a/test/integration/lib/harness.js
+++ b/test/integration/lib/harness.js
@@ -4,7 +4,7 @@ import path from 'path';
 import fs from 'fs';
 import glob from 'glob';
 import {shuffle} from 'shuffle-seed';
-import {queue} from 'd3-queue';
+import {queue} from 'd3';
 import colors from 'chalk';
 import template from 'lodash.template';
 import createServer from './server';
diff --git a/test/integration/package.json b/test/integration/package.json
deleted file mode 100644
index 9afea8cef14..00000000000
--- a/test/integration/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "@mapbox/mapbox-gl-test-suite",
-  "description": "Rendering tests for Mapbox GL",
-  "version": "0.0.0",
-  "license": "BSD",
-  "main": "index.js",
-  "dependencies": {
-    "@mapbox/mvt-fixtures": "^3.5.1",
-    "chalk": "^2.4.2",
-    "d3-queue": "^3.0.7",
-    "diff": "^4.0.1",
-    "json-stringify-pretty-compact": "^2.0.0",
-    "lodash.template": "^4.4.0",
-    "mapbox-gl-styles": "2.0.2",
-    "pixelmatch": "^5.0.2",
-    "pngjs": "^3.4.0",
-    "shuffle-seed": "^1.1.6",
-    "st": "^1.2.2",
-    "glob": "^7.1.4"
-  }
-}
diff --git a/test/integration/tiles/upgrade.js b/test/integration/tiles/upgrade.js
index 1ee44f24bb1..5a096b99b45 100644
--- a/test/integration/tiles/upgrade.js
+++ b/test/integration/tiles/upgrade.js
@@ -2,7 +2,7 @@
 
 const mapnik = require('mapnik');
 const fs = require('fs');
-const queue = require('d3-queue').queue;
+const queue = require('d3').queue;
 
 function upgrade(z, x, y, path, callback) {
     console.log('Updating ', path);
diff --git a/yarn.lock b/yarn.lock
index 5f01803828d..3f1d32ba56c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1009,23 +1009,7 @@
   resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.4.1.tgz#c0a03cf75f8b0ad7b57849d6c7e91b0aec4b640f"
   integrity sha512-yyKza9S6z3ELKuf6w5n6VNUB0Osu6Z93RXPfMHLIlNWohu3KqxewLOq4lMXseYJ92GwkRAxd207Pr/Z98cwmvw==
 
-"@mapbox/mapbox-gl-test-suite@file:test/integration":
-  version "0.0.0"
-  dependencies:
-    "@mapbox/mvt-fixtures" "^3.5.1"
-    chalk "^2.4.2"
-    d3-queue "^3.0.7"
-    diff "^4.0.1"
-    glob "^7.1.4"
-    json-stringify-pretty-compact "^2.0.0"
-    lodash.template "^4.4.0"
-    mapbox-gl-styles "2.0.2"
-    pixelmatch "^5.0.2"
-    pngjs "^3.4.0"
-    shuffle-seed "^1.1.6"
-    st "^1.2.2"
-
-"@mapbox/mvt-fixtures@^3.5.1":
+"@mapbox/mvt-fixtures@^3.6.0":
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/@mapbox/mvt-fixtures/-/mvt-fixtures-3.6.0.tgz#0d359c1eca9499db8b5b57292b1f986921ef0fbd"
   integrity sha512-YgaODBQdutOcCnOiRJzbJO3lRejuaeuwfYk0XxfVlAi6L+UDXVHzi7NlpAa6GAYGzQm1V1KLk+2Io8+aSv8I+w==
@@ -1175,6 +1159,11 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
 "@types/estree@*", "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
@@ -1390,6 +1379,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172"
+  integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
 ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
@@ -2226,6 +2223,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chalk@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
@@ -2416,12 +2421,19 @@ color-convert@^1.9.0, color-convert@^1.9.1:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -4828,6 +4840,11 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
@@ -6161,7 +6178,7 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash.template@^4.4.0:
+lodash.template@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
   integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
@@ -6297,7 +6314,7 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-mapbox-gl-styles@2.0.2:
+mapbox-gl-styles@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/mapbox-gl-styles/-/mapbox-gl-styles-2.0.2.tgz#bb525b77ea0dc2b041bb8051645176f3783e294a"
   integrity sha1-u1Jbd+oNwrBBu4BRZFF283g+KUo=
@@ -7552,7 +7569,7 @@ pirates@^4.0.1:
   dependencies:
     node-modules-regexp "^1.0.0"
 
-pixelmatch@^5.0.2:
+pixelmatch@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-5.1.0.tgz#b640f0e5a03a09f235a4b818ef3b9b98d9d0b911"
   integrity sha512-HqtgvuWN12tBzKJf7jYsc38Ha28Q2NYpmBL9WostEGgDHJqbTLkjydZXL1ZHM02ZnB+Dkwlxo87HBY38kMiD6A==
@@ -9809,6 +9826,13 @@ supports-color@^6.0.0, supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
 svg-tags@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"