diff --git a/.eslintrc.json b/.eslintrc.json
index 7425f5952..e0be41761 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -12,7 +12,8 @@
         "@babel",
         "promise",
         "deprecate",
-        "jsdoc"
+        "jsdoc",
+        "mocha"
 
 ],
 
@@ -37,8 +38,8 @@
         "sourceType": "module"
     },
     "rules": {
-        "node/no-unsupported-features/es-syntax": "off",
-        "node/no-missing-import": "off",
+        "node/no-unsupported-features/es-syntax": "on",
+        "node/no-missing-import": "on",
         "lodash/prefer-lodash-method": "off",
         "lodash/prefer-lodash-typecheck": "off",
         "lodash/prefer-get": "off",
diff --git a/tests/support/end2end-server.js b/tests/support/end2end-server.js
index b9cb94077..9da50fdc3 100644
--- a/tests/support/end2end-server.js
+++ b/tests/support/end2end-server.js
@@ -1,5 +1,5 @@
-import task from "./lib/task.js";
-
+import run from "./lib/task.js";
+import { createInterface, on } from "readline";
 function logTask(taskname) {
   return (data) => {
     process.stdout.write(`${taskname}: ${data}`);
@@ -7,8 +7,8 @@ function logTask(taskname) {
 }
 
 const tasks = [
-  task.run("npm", ["run", "test:end2end:ldap"], logTask("ldap")),
-  task.run("npm", ["run", "test:end2end:meteor"], logTask("meteor")),
+  run("npm", ["run", "test:end2end:ldap"], logTask("ldap")),
+  run("npm", ["run", "test:end2end:meteor"], logTask("meteor")),
 ];
 
 function shutdown() {
@@ -30,12 +30,12 @@ function shutdown() {
 }
 
 if (process.platform === "win32") {
-  const readline = require("readline").createInterface({
+  createInterface({
     input: process.stdin,
     output: process.stdout,
   });
 
-  readline.on("SIGINT", shutdown);
+  on("SIGINT", shutdown);
 }
 
 process.on("uncaughtException", shutdown);
diff --git a/tests/support/ldap-server.js b/tests/support/ldap-server.js
index de3d82377..97abeab54 100644
--- a/tests/support/ldap-server.js
+++ b/tests/support/ldap-server.js
@@ -3,7 +3,8 @@
  * @module ldap-server
  */
 
-import { createServer, InsufficientAccessRightsError, UnwillingToPerformError, NoSuchObjectError, InvalidCredentialsError } from "ldapjs";
+import pkg from 'ldapjs';
+const { createServer, InsufficientAccessRightsError, UnwillingToPerformError, NoSuchObjectError, InvalidCredentialsError } = pkg
 
 /**
  * Array of user objects representing LDAP users.