diff --git a/.circleci/test.sh b/.circleci/test.sh
index 570b1e888ab..7d62f24f64c 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -45,7 +45,8 @@ case $1 in
         set_tz
 
         SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
-        npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
+        MAX_AUTO_RETRY=2
+        retry npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
 
         exit $EXIT_STATE
         ;;
@@ -55,7 +56,7 @@ case $1 in
 
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
         for s in ${SHARDS[@]}; do
-            MAX_AUTO_RETRY=1
+            MAX_AUTO_RETRY=2
             retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --doNotFailOnEmptyTestSuite
         done
 
diff --git a/test/jasmine/tests/gl3d_hover_click_test.js b/test/jasmine/tests/gl3d_hover_click_test.js
index 374ade0178c..3fbb56edeaa 100644
--- a/test/jasmine/tests/gl3d_hover_click_test.js
+++ b/test/jasmine/tests/gl3d_hover_click_test.js
@@ -543,7 +543,7 @@ describe('Test gl3d trace click/hover:', function() {
         .then(done, done.fail);
     });
 
-    it('@noCI @gl should display correct face colors', function(done) {
+    it('@gl should display correct face colors', function(done) {
         var fig = mesh3dcoloringMock;
 
         Plotly.newPlot(gd, fig)
@@ -595,7 +595,7 @@ describe('Test gl3d trace click/hover:', function() {
         .then(done, done.fail);
     });
 
-    it('@noCI @gl should display correct face intensities (uniform grid)', function(done) {
+    it('@gl should display correct face intensities (uniform grid)', function(done) {
         var fig = mesh3dcellIntensityMock;
 
         Plotly.newPlot(gd, fig)
@@ -625,37 +625,32 @@ describe('Test gl3d trace click/hover:', function() {
         .then(done, done.fail);
     });
 
-    it('@noCI @gl should display correct face intensities (non-uniform grid)', function(done) {
-        var fig = mesh3dbunnyMock;
+    it('@gl should display correct face intensities (non-uniform grid)', function(done) {
+        var fig = Lib.extendDeep({}, mesh3dbunnyMock);
+
+        fig.layout.scene.camera.eye = {
+            x: 0,
+            y: 0.2,
+            z: 0.05
+        };
 
         Plotly.newPlot(gd, fig)
         .then(delay(20))
-        .then(function() { mouseEvent('mouseover', 300, 200); })
-        .then(delay(20))
-        .then(function() {
-            assertHoverText(
-                'x: −0.02154988',
-                'y: −0.1181136',
-                'z: 0.9471037',
-                'cell intensity: 8',
-                'trace 0'
-            );
-        })
-        .then(function() { mouseEvent('mouseover', 400, 300); })
+        .then(function() { mouseEvent('mouseover', 300, 100); })
         .then(delay(20))
         .then(function() {
             assertHoverText(
-                'x: −0.3543044',
-                'y: 0.4389607',
-                'z: 0.6468034',
-                'cell intensity: 8',
+                'x: 0.0112223',
+                'y: −0.05352963',
+                'z: 0.5941605',
+                'cell intensity: 12',
                 'trace 0'
             );
         })
         .then(done, done.fail);
     });
 
-    it('@noCI @gl should display correct face intensities *alpha-hull* case', function(done) {
+    it('@gl should display correct face intensities *alpha-hull* case', function(done) {
         var fig = {
             data: [{
                 type: 'mesh3d',
@@ -698,7 +693,7 @@ describe('Test gl3d trace click/hover:', function() {
         .then(done, done.fail);
     });
 
-    it('@noCI @gl should display correct face intensities *delaunay* case', function(done) {
+    it('@gl should display correct face intensities *delaunay* case', function(done) {
         var fig = {
             data: [{
                 type: 'mesh3d',
diff --git a/test/jasmine/tests/select_test.js b/test/jasmine/tests/select_test.js
index ee101c4ed5d..233af05aae7 100644
--- a/test/jasmine/tests/select_test.js
+++ b/test/jasmine/tests/select_test.js
@@ -2010,7 +2010,7 @@ describe('Test select box and lasso per trace:', function() {
     });
 
     [false, true].forEach(function(hasCssTransform) {
-        it('@noCI @gl should work on choroplethmapbox traces, hasCssTransform: ' + hasCssTransform, function(done) {
+        it('@gl should work on choroplethmapbox traces, hasCssTransform: ' + hasCssTransform, function(done) {
             var assertPoints = makeAssertPoints(['location', 'z']);
             var assertRanges = makeAssertRanges('mapbox');
             var assertLassoPoints = makeAssertLassoPoints('mapbox');
@@ -2034,7 +2034,7 @@ describe('Test select box and lasso per trace:', function() {
                     [[150, 150], [300, 300]],
                     function() {
                         assertPoints([['NY', 10]]);
-                        assertRanges([[-83.29, 46.13], [-73.97, 39.29]]);
+                        assertRanges([[-83.38, 46.13], [-74.06, 39.29]]);
                         assertSelectedPoints({0: [0]});
                     },
                     null, BOXEVENTS, 'choroplethmapbox select'
@@ -2050,8 +2050,8 @@ describe('Test select box and lasso per trace:', function() {
                         assertPoints([['MA', 20]]);
                         assertSelectedPoints({0: [1]});
                         assertLassoPoints([
-                            [-73.97, 43.936], [-73.97, 39.293], [-67.756, 39.293],
-                            [-67.756, 43.936], [-73.971, 43.936]
+                            [-74.06, 43.936], [-74.06, 39.293], [-67.84, 39.293],
+                            [-67.84, 43.936], [-74.06, 43.936]
                         ]);
                     },
                     null, LASSOEVENTS, 'choroplethmapbox lasso'