diff --git a/lib/index.js b/lib/index.js
index a870b3897c5..4f37449c9c3 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -25,7 +25,8 @@ Plotly.register([
     require('./scattergeo'),
     require('./choropleth'),
     require('./scattergl'),
-    require('./scatterternary')
+    require('./scatterternary'),
+    require('./scattermapbox')
 ]);
 
 module.exports = Plotly;
diff --git a/test/image/baselines/mapbox_0.png b/test/image/baselines/mapbox_0.png
index 9b869bac3ec..6af8251f6ab 100644
Binary files a/test/image/baselines/mapbox_0.png and b/test/image/baselines/mapbox_0.png differ
diff --git a/test/image/baselines/mapbox_angles.png b/test/image/baselines/mapbox_angles.png
index a3c0606f57b..f022f262813 100644
Binary files a/test/image/baselines/mapbox_angles.png and b/test/image/baselines/mapbox_angles.png differ
diff --git a/test/image/baselines/mapbox_connectgaps.png b/test/image/baselines/mapbox_connectgaps.png
index 9fee51670db..af554d97a38 100644
Binary files a/test/image/baselines/mapbox_connectgaps.png and b/test/image/baselines/mapbox_connectgaps.png differ
diff --git a/test/image/baselines/mapbox_custom-style.png b/test/image/baselines/mapbox_custom-style.png
index ba20f14f01e..2eb7063177e 100644
Binary files a/test/image/baselines/mapbox_custom-style.png and b/test/image/baselines/mapbox_custom-style.png differ
diff --git a/test/image/baselines/mapbox_layers.png b/test/image/baselines/mapbox_layers.png
index 9a7e16709c8..b8e79cbb279 100644
Binary files a/test/image/baselines/mapbox_layers.png and b/test/image/baselines/mapbox_layers.png differ
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
index ac5f5cccf95..6e4d320038d 100644
--- a/test/image/compare_pixels_test.js
+++ b/test/image/compare_pixels_test.js
@@ -55,10 +55,10 @@ if(mockList.length === 0) {
     throw new Error('No mocks found with pattern ' + pattern);
 }
 
-mockList = mockList.filter(untestableFilter);
-
-if(mockList.length === 0) {
-    throw new Error('All mocks found with pattern ' + pattern + ' are currently untestable');
+// filter out untestable mocks if no pattern is specified
+if(!pattern) {
+    console.log('Filtering out untestable mocks\n');
+    mockList = mockList.filter(untestableFilter);
 }
 
 // main
diff --git a/test/jasmine/tests/mapbox_test.js b/test/jasmine/tests/mapbox_test.js
index f8acf99dd69..06c1f66cca0 100644
--- a/test/jasmine/tests/mapbox_test.js
+++ b/test/jasmine/tests/mapbox_test.js
@@ -17,11 +17,6 @@ var MOUSE_DELAY = 100;
 
 var noop = function() {};
 
-// until it is part of the main plotly.js bundle
-Plotly.register(
-    require('@lib/scattermapbox')
-);
-
 Plotly.setPlotConfig({
     mapboxAccessToken: MAPBOX_ACCESS_TOKEN
 });
diff --git a/test/jasmine/tests/plotschema_test.js b/test/jasmine/tests/plotschema_test.js
index 5f2195bfe28..f9ba1086f2a 100644
--- a/test/jasmine/tests/plotschema_test.js
+++ b/test/jasmine/tests/plotschema_test.js
@@ -2,9 +2,6 @@ var Plotly = require('@lib/index');
 var Lib = require('@src/lib');
 
 Plotly.register([
-    // until it is part of the main plotly.js bundle
-    require('@lib/scattermapbox'),
-
     // until they become official
     require('../assets/transforms/filter')
 ]);
diff --git a/test/jasmine/tests/scattermapbox_test.js b/test/jasmine/tests/scattermapbox_test.js
index 22bf6f4a2dd..e8eea6e1a2e 100644
--- a/test/jasmine/tests/scattermapbox_test.js
+++ b/test/jasmine/tests/scattermapbox_test.js
@@ -10,11 +10,6 @@ var destroyGraphDiv = require('../assets/destroy_graph_div');
 var hasWebGLSupport = require('../assets/has_webgl_support');
 var customMatchers = require('../assets/custom_matchers');
 
-// until it is part of the main plotly.js bundle
-Plotly.register(
-    require('@lib/scattermapbox')
-);
-
 Plotly.setPlotConfig({
     mapboxAccessToken: require('@build/credentials.json').MAPBOX_ACCESS_TOKEN
 });