diff --git a/.eslintrc b/.eslintrc
index 73157aef2..4a074c23f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -43,6 +43,7 @@
         "no-octal-escape": "error",
         "no-process-env": "error",
         "no-proto": "error",
+        "no-prototype-builtins": "off",
         "no-return-assign": "off",
         "no-script-url": "error",
         "no-self-compare": "error",
diff --git a/package.json b/package.json
index fc801874d..fa949a8e4 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "concat-files": "^0.1.1",
     "d3": "~5.9.2",
     "editor-layer-index": "github:osmlab/editor-layer-index#gh-pages",
-    "eslint": "^5.16.0",
+    "eslint": "^6.0.0",
     "gaze": "^1.1.1",
     "glob": "^7.1.0",
     "happen": "^0.3.1",
diff --git a/test/spec/services/osm.js b/test/spec/services/osm.js
index 45c438f5f..61625a15b 100644
--- a/test/spec/services/osm.js
+++ b/test/spec/services/osm.js
@@ -284,7 +284,7 @@ describe('iD.serviceOsm', function () {
             window.setTimeout(function() {
                 expect(spy).to.have.been.calledOnce;
                 done();
-            }, 50);
+            }, 500);
         });
 
         it('#isDataLoaded', function(done) {
@@ -298,7 +298,7 @@ describe('iD.serviceOsm', function () {
             window.setTimeout(function() {
                 expect(connection.isDataLoaded([-74.0444216, 40.6694299])).to.be.ok;
                 done();
-            }, 50);
+            }, 500);
         });
     });
 
@@ -609,7 +609,7 @@ describe('iD.serviceOsm', function () {
             window.setTimeout(function() {
                 expect(spy).to.have.been.calledOnce;
                 done();
-            }, 50);
+            }, 500);
         });
     });