diff --git a/tasks/test_mock.js b/tasks/test_mock.js
index a68fa292b1a..384a296d2f1 100644
--- a/tasks/test_mock.js
+++ b/tasks/test_mock.js
@@ -153,7 +153,7 @@ function notBlackListed(name) {
         'fake_violins',
         'fonts',
         'font-variant-bar',
-        'zz-font-weight-bar',
+        'font-weight-bar',
         'geo_africa-insets',
         'gl2d_10',
         'gl2d_12',
diff --git a/test/image/baselines/zz-font-weight-bar.png b/test/image/baselines/font-weight-bar.png
similarity index 100%
rename from test/image/baselines/zz-font-weight-bar.png
rename to test/image/baselines/font-weight-bar.png
diff --git a/test/image/baselines/zz-font-weight-scatter.png b/test/image/baselines/font-weight-scatter.png
similarity index 100%
rename from test/image/baselines/zz-font-weight-scatter.png
rename to test/image/baselines/font-weight-scatter.png
diff --git a/test/image/baselines/zz-gl2d_font-weight-scatter.png b/test/image/baselines/gl2d_font-weight-scatter.png
similarity index 100%
rename from test/image/baselines/zz-gl2d_font-weight-scatter.png
rename to test/image/baselines/gl2d_font-weight-scatter.png
diff --git a/test/image/baselines/zz-gl3d_font-weight-scatter.png b/test/image/baselines/gl3d_font-weight-scatter.png
similarity index 100%
rename from test/image/baselines/zz-gl3d_font-weight-scatter.png
rename to test/image/baselines/gl3d_font-weight-scatter.png
diff --git a/test/image/baselines/icicle_textposition.png b/test/image/baselines/icicle_textposition.png
index 57f5c6e3ca6..1c1fbfc12a8 100644
Binary files a/test/image/baselines/icicle_textposition.png and b/test/image/baselines/icicle_textposition.png differ
diff --git a/test/image/baselines/mapbox_fonts-supported-metropolis-italic.png b/test/image/baselines/mapbox_fonts-supported-metropolis-italic.png
new file mode 100644
index 00000000000..378be30d784
Binary files /dev/null and b/test/image/baselines/mapbox_fonts-supported-metropolis-italic.png differ
diff --git a/test/image/baselines/pattern_bars.png b/test/image/baselines/pattern_bars.png
index 69a0826e27c..077c05cf164 100644
Binary files a/test/image/baselines/pattern_bars.png and b/test/image/baselines/pattern_bars.png differ
diff --git a/test/image/baselines/pattern_fgcolor_overlay_fillmode.png b/test/image/baselines/pattern_fgcolor_overlay_fillmode.png
index 6c6b5fbb821..af59862d58a 100644
Binary files a/test/image/baselines/pattern_fgcolor_overlay_fillmode.png and b/test/image/baselines/pattern_fgcolor_overlay_fillmode.png differ
diff --git a/test/image/baselines/pie_textpad_radial.png b/test/image/baselines/pie_textpad_radial.png
index 20733b24acc..236b381d089 100644
Binary files a/test/image/baselines/pie_textpad_radial.png and b/test/image/baselines/pie_textpad_radial.png differ
diff --git a/test/image/baselines/sunburst_packages_colorscale_novalue.png b/test/image/baselines/sunburst_packages_colorscale_novalue.png
index bcc8b6d907e..2f09e9246aa 100644
Binary files a/test/image/baselines/sunburst_packages_colorscale_novalue.png and b/test/image/baselines/sunburst_packages_colorscale_novalue.png differ
diff --git a/test/image/baselines/treemap_sunburst_marker_colors.png b/test/image/baselines/treemap_sunburst_marker_colors.png
index 209427c1b2a..2ad27d25deb 100644
Binary files a/test/image/baselines/treemap_sunburst_marker_colors.png and b/test/image/baselines/treemap_sunburst_marker_colors.png differ
diff --git a/test/image/baselines/uniformtext_bar_edgecase1.png b/test/image/baselines/uniformtext_bar_edgecase1.png
index 8c353512168..4beaa6bba51 100644
Binary files a/test/image/baselines/uniformtext_bar_edgecase1.png and b/test/image/baselines/uniformtext_bar_edgecase1.png differ
diff --git a/test/image/baselines/uniformtext_sunburst_treemap.png b/test/image/baselines/uniformtext_sunburst_treemap.png
index d99afe65a59..31adc8ab71e 100644
Binary files a/test/image/baselines/uniformtext_sunburst_treemap.png and b/test/image/baselines/uniformtext_sunburst_treemap.png differ
diff --git a/test/image/mocks/zz-font-weight-bar.json b/test/image/mocks/font-weight-bar.json
similarity index 100%
rename from test/image/mocks/zz-font-weight-bar.json
rename to test/image/mocks/font-weight-bar.json
diff --git a/test/image/mocks/zz-font-weight-scatter.json b/test/image/mocks/font-weight-scatter.json
similarity index 100%
rename from test/image/mocks/zz-font-weight-scatter.json
rename to test/image/mocks/font-weight-scatter.json
diff --git a/test/image/mocks/zz-gl2d_font-weight-scatter.json b/test/image/mocks/gl2d_font-weight-scatter.json
similarity index 100%
rename from test/image/mocks/zz-gl2d_font-weight-scatter.json
rename to test/image/mocks/gl2d_font-weight-scatter.json
diff --git a/test/image/mocks/zz-gl3d_font-weight-scatter.json b/test/image/mocks/gl3d_font-weight-scatter.json
similarity index 100%
rename from test/image/mocks/zz-gl3d_font-weight-scatter.json
rename to test/image/mocks/gl3d_font-weight-scatter.json
diff --git a/test/image/mocks/mapbox_fonts-supported-metropolis-italic.json b/test/image/mocks/mapbox_fonts-supported-metropolis-italic.json
new file mode 100644
index 00000000000..c80387f71d2
--- /dev/null
+++ b/test/image/mocks/mapbox_fonts-supported-metropolis-italic.json
@@ -0,0 +1,404 @@
+{
+  "data": [
+    {
+      "subplot": "mapbox",
+      "textfont": {
+        "size": 20,
+        "color": "red",
+        "family": "Metropolis Regular"
+      },
+      "text": [
+        "Metropolis Regular",
+        "Montreal",
+        "Toronto",
+        "Vancouver",
+        "Calgary",
+        "Edmonton",
+        "Ottawa",
+        "Halifax",
+        "Victoria",
+        "Winnepeg",
+        "Regina"
+      ],
+      "textposition": "top center",
+      "marker": {
+        "color": "blue",
+        "opacity": 0.5,
+        "size": [0, 20, 30, 20, 20, 10, 10, 10, 10, 10, 10]
+      },
+      "type": "scattermapbox",
+      "mode": "markers+text",
+      "lon": [-90, -73.56, -79.38, -123.12, -114.07, -113.49, -75.69, -63.57, -123.36, -97.13, -104.61],
+      "lat": [55, 45.5, 43.65, 49.28, 51.04, 53.54, 45.42, 44.64, 48.42, 49.89, 50.44]
+    }, {
+        "subplot": "mapbox2",
+        "textfont": {
+          "size": 20,
+          "color": "red",
+          "family": "Metropolis Black"
+        },
+        "text": [
+          "Metropolis Black",
+          "Montreal",
+          "Toronto",
+          "Vancouver",
+          "Calgary",
+          "Edmonton",
+          "Ottawa",
+          "Halifax",
+          "Victoria",
+          "Winnepeg",
+          "Regina"
+        ],
+        "textposition": "top center",
+        "marker": {
+          "color": "blue",
+          "opacity": 0.5,
+          "size": [0, 20, 30, 20, 20, 10, 10, 10, 10, 10, 10]
+        },
+        "type": "scattermapbox",
+        "mode": "markers+text",
+        "lon": [-90, -73.56, -79.38, -123.12, -114.07, -113.49, -75.69, -63.57, -123.36, -97.13, -104.61],
+        "lat": [55, 45.5, 43.65, 49.28, 51.04, 53.54, 45.42, 44.64, 48.42, 49.89, 50.44]
+    }, {
+      "subplot": "mapbox3",
+      "textfont": {
+        "size": 20,
+        "color": "red",
+        "family": "Metropolis Bold"
+      },
+      "text": [
+        "Metropolis Bold",
+        "Montreal",
+        "Toronto",
+        "Vancouver",
+        "Calgary",
+        "Edmonton",
+        "Ottawa",
+        "Halifax",
+        "Victoria",
+        "Winnepeg",
+        "Regina"
+      ],
+      "textposition": "top center",
+      "marker": {
+        "color": "blue",
+        "opacity": 0.5,
+        "size": [0, 20, 30, 20, 20, 10, 10, 10, 10, 10, 10]
+      },
+      "type": "scattermapbox",
+      "mode": "markers+text",
+      "lon": [-90, -73.56, -79.38, -123.12, -114.07, -113.49, -75.69, -63.57, -123.36, -97.13, -104.61],
+      "lat": [55, 45.5, 43.65, 49.28, 51.04, 53.54, 45.42, 44.64, 48.42, 49.89, 50.44]
+    }, {
+      "subplot": "mapbox4",
+      "textfont": {
+        "size": 20,
+        "color": "red",
+        "family": "Metropolis Extra Bold"
+      },
+      "text": [
+        "Metropolis Extra Bold",
+        "Montreal",
+        "Toronto",
+        "Vancouver",
+        "Calgary",
+        "Edmonton",
+        "Ottawa",
+        "Halifax",
+        "Victoria",
+        "Winnepeg",
+        "Regina"
+      ],
+      "textposition": "top center",
+      "marker": {
+        "color": "blue",
+        "opacity": 0.5,
+        "size": [0, 20, 30, 20, 20, 10, 10, 10, 10, 10, 10]
+      },
+      "type": "scattermapbox",
+      "mode": "markers+text",
+      "lon": [-90, -73.56, -79.38, -123.12, -114.07, -113.49, -75.69, -63.57, -123.36, -97.13, -104.61],
+      "lat": [55, 45.5, 43.65, 49.28, 51.04, 53.54, 45.42, 44.64, 48.42, 49.89, 50.44]
+    }, {
+      "subplot": "mapbox5",
+      "textfont": {
+        "size": 20,
+        "color": "red",
+        "family": "Metropolis Thin"
+      },
+      "text": [
+        "Metropolis Thin",
+        "Montreal",
+        "Toronto",
+        "Vancouver",
+        "Calgary",
+        "Edmonton",
+        "Ottawa",
+        "Halifax",
+        "Victoria",
+        "Winnepeg",
+        "Regina"
+      ],
+      "textposition": "top center",
+      "marker": {
+        "color": "blue",
+        "opacity": 0.5,
+        "size": [0, 20, 30, 20, 20, 10, 10, 10, 10, 10, 10]
+      },
+      "type": "scattermapbox",
+      "mode": "markers+text",
+      "lon": [-90, -73.56, -79.38, -123.12, -114.07, -113.49, -75.69, -63.57, -123.36, -97.13, -104.61],
+      "lat": [55, 45.5, 43.65, 49.28, 51.04, 53.54, 45.42, 44.64, 48.42, 49.89, 50.44]
+    }, {
+      "subplot": "mapbox6",
+      "textfont": {
+        "size": 20,
+        "color": "red",
+        "family": "Metropolis Extra Light"
+      },
+      "text": [
+        "Metropolis Extra Light",
+        "Montreal",
+        "Toronto",
+        "Vancouver",
+        "Calgary",
+        "Edmonton",
+        "Ottawa",
+        "Halifax",
+        "Victoria",
+        "Winnepeg",
+        "Regina"
+      ],
+      "textposition": "top center",
+      "marker": {
+        "color": "blue",
+        "opacity": 0.5,
+        "size": [0, 20, 30, 20, 20, 10, 10, 10, 10, 10, 10]
+      },
+      "type": "scattermapbox",
+      "mode": "markers+text",
+      "lon": [-90, -73.56, -79.38, -123.12, -114.07, -113.49, -75.69, -63.57, -123.36, -97.13, -104.61],
+      "lat": [55, 45.5, 43.65, 49.28, 51.04, 53.54, 45.42, 44.64, 48.42, 49.89, 50.44]
+    }, {
+      "subplot": "mapbox7",
+      "textfont": {
+        "size": 20,
+        "color": "red",
+        "family": "Metropolis Light"
+      },
+      "text": [
+        "Metropolis Light",
+        "Montreal",
+        "Toronto",
+        "Vancouver",
+        "Calgary",
+        "Edmonton",
+        "Ottawa",
+        "Halifax",
+        "Victoria",
+        "Winnepeg",
+        "Regina"
+      ],
+      "textposition": "top center",
+      "marker": {
+        "color": "blue",
+        "opacity": 0.5,
+        "size": [0, 20, 30, 20, 20, 10, 10, 10, 10, 10, 10]
+      },
+      "type": "scattermapbox",
+      "mode": "markers+text",
+      "lon": [-90, -73.56, -79.38, -123.12, -114.07, -113.49, -75.69, -63.57, -123.36, -97.13, -104.61],
+      "lat": [55, 45.5, 43.65, 49.28, 51.04, 53.54, 45.42, 44.64, 48.42, 49.89, 50.44]
+    }, {
+      "subplot": "mapbox8",
+      "textfont": {
+        "size": 20,
+        "color": "red",
+        "family": "Metropolis Medium"
+      },
+      "text": [
+        "Metropolis Medium",
+        "Montreal",
+        "Toronto",
+        "Vancouver",
+        "Calgary",
+        "Edmonton",
+        "Ottawa",
+        "Halifax",
+        "Victoria",
+        "Winnepeg",
+        "Regina"
+      ],
+      "textposition": "top center",
+      "marker": {
+        "color": "blue",
+        "opacity": 0.5,
+        "size": [0, 20, 30, 20, 20, 10, 10, 10, 10, 10, 10]
+      },
+      "type": "scattermapbox",
+      "mode": "markers+text",
+      "lon": [-90, -73.56, -79.38, -123.12, -114.07, -113.49, -75.69, -63.57, -123.36, -97.13, -104.61],
+      "lat": [55, 45.5, 43.65, 49.28, 51.04, 53.54, 45.42, 44.64, 48.42, 49.89, 50.44]
+    }, {
+      "subplot": "mapbox9",
+      "textfont": {
+        "size": 20,
+        "color": "red",
+        "family": "Metropolis Semi Bold"
+      },
+      "text": [
+        "Metropolis Semi Bold",
+        "Montreal",
+        "Toronto",
+        "Vancouver",
+        "Calgary",
+        "Edmonton",
+        "Ottawa",
+        "Halifax",
+        "Victoria",
+        "Winnepeg",
+        "Regina"
+      ],
+      "textposition": "top center",
+      "marker": {
+        "color": "blue",
+        "opacity": 0.5,
+        "size": [0, 20, 30, 20, 20, 10, 10, 10, 10, 10, 10]
+      },
+      "type": "scattermapbox",
+      "mode": "markers+text",
+      "lon": [-90, -73.56, -79.38, -123.12, -114.07, -113.49, -75.69, -63.57, -123.36, -97.13, -104.61],
+      "lat": [55, 45.5, 43.65, 49.28, 51.04, 53.54, 45.42, 44.64, 48.42, 49.89, 50.44]
+    }
+  ],
+  "layout": {
+    "showlegend": false,
+    "margin": {
+      "t": 50,
+      "b": 10,
+      "l": 10,
+      "r": 10
+    },
+    "title": {
+      "text": "Supported Metropolis fonts in mapbox",
+      "font": {
+        "weight": 800,
+        "style": "italic"
+      }
+    },
+    "mapbox": {
+      "zoom": 3,
+      "style": "carto-positron",
+      "center": {
+        "lon": -90,
+        "lat": 50
+      },
+      "domain": {
+        "x": [0, 1],
+        "y": [0.89, 0.99]
+      }
+    },
+    "mapbox2": {
+      "zoom": 3,
+      "style": "carto-positron",
+      "center": {
+        "lon": -90,
+        "lat": 50
+      },
+      "domain": {
+        "x": [0, 1],
+        "y": [0.78, 0.88]
+      }
+    },
+    "mapbox3": {
+      "zoom": 3,
+      "style": "carto-positron",
+      "center": {
+        "lon": -90,
+        "lat": 50
+      },
+      "domain": {
+        "x": [0, 1],
+        "y": [0.67, 0.77]
+      }
+    },
+    "mapbox4": {
+      "zoom": 3,
+      "style": "carto-positron",
+      "center": {
+        "lon": -90,
+        "lat": 50
+      },
+      "domain": {
+        "x": [0, 1],
+        "y": [0.56, 0.66]
+      }
+    },
+    "mapbox5": {
+      "zoom": 3,
+      "style": "carto-positron",
+      "center": {
+        "lon": -90,
+        "lat": 50
+      },
+      "domain": {
+        "x": [0, 1],
+        "y": [0.45, 0.55]
+      }
+    },
+    "mapbox6": {
+      "zoom": 3,
+      "style": "carto-positron",
+      "center": {
+        "lon": -90,
+        "lat": 50
+      },
+      "domain": {
+        "x": [0, 1],
+        "y": [0.34, 0.44]
+      }
+    },
+    "mapbox7": {
+      "zoom": 3,
+      "style": "carto-positron",
+      "center": {
+        "lon": -90,
+        "lat": 50
+      },
+      "domain": {
+        "x": [0, 1],
+        "y": [0.23, 0.33]
+      }
+    },
+    "mapbox8": {
+      "zoom": 3,
+      "style": "carto-positron",
+      "center": {
+        "lon": -90,
+        "lat": 50
+      },
+      "domain": {
+        "x": [0, 1],
+        "y": [0.12, 0.22]
+      }
+    },
+    "mapbox9": {
+      "zoom": 3,
+      "style": "carto-positron",
+      "center": {
+        "lon": -90,
+        "lat": 50
+      },
+      "domain": {
+        "x": [0, 1],
+        "y": [0.01, 0.11]
+      }
+    },
+    "font": {
+        "style": "italic"
+    },
+    "height": 2700,
+    "width": 900
+  }
+}