diff --git a/.eslintignore b/.eslintignore
index efdbb4d..168a079 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,5 @@
 node_modules/
+examples/
 build/
 static/
 config/
diff --git a/.eslintrc b/.eslintrc
index c3147b5..bcdcd68 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,35 +1,4 @@
 {
-	"extends": "airbnb-base",
-	"env": {
-		"node": true,
-		"mocha": true
-	},
-	"parserOptions": {
-		"ecmaVersion": 8,
-		"sourceType": "script",
-		"ecmaFeatures": {
-			"modules": false
-		}
-	},
-	"rules": {
-		"max-len": 0,
-		"linebreak-style": 0,
-		"no-plusplus": [
-			2,
-			{
-				"allowForLoopAfterthoughts": true
-			}
-		],
-		"no-continue": 0,
-		"indent": [2, "tab"],
-		"no-tabs": 0,
-		"strict": [2, "safe"],
-		"curly": [2, "multi", "consistent"],
-		"import/no-extraneous-dependencies": 0,
-		"import/no-unresolved": 0,
-		"no-underscore-dangle": 0,
-		"no-param-reassign": 0,
-		"generator-star-spacing": 0,
-		"jsx-a11y/href-no-hash": "off"
-	}
+	"extends": "ecollect-base",
+	"root": true
 }
diff --git a/package.json b/package.json
index 46fbe81..f7b6486 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
 	"description": "Node.js ISO 20022 Compliant EBICS Client",
 	"main": "index.js",
 	"scripts": {
-		"test": "mocha"
+		"lint": "eslint .",
+		"test": "mocha test/*/**.js"
 	},
 	"repository": {
 		"type": "git",
@@ -42,10 +43,10 @@
 	},
 	"devDependencies": {
 		"chai": "^4.2.0",
-		"eslint": "^4.19.1",
-		"eslint-config-airbnb-base": "^12.1.0",
-		"eslint-plugin-import": "^2.12.0",
+		"eslint": "^6.6.0",
+		"eslint-config-ecollect-base": "^0.1.2",
+		"eslint-plugin-import": "^2.18.2",
 		"libxmljs": "^0.19.7",
-		"mocha": "^6.1.4"
+		"mocha": "^6.2.2"
 	}
 }