diff --git a/.travis.yml b/.travis.yml
index d8e4c39..e94ecea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: node_js
 node_js:
     - "8"
     - "10"
+    - "11"
     - "node"
 
 env:
diff --git a/jest.config.js b/jest.config.js
index 9596024..b2ff4fd 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,15 +1,22 @@
 module.exports = {
-  collectCoverage: true,
-  collectCoverageFrom: ['lib/index.js'],
-  coverageDirectory: './coverage',
-  coverageThreshold: {
-    global: {
-      branches: 100,
-      functions: 100,
-      lines: 100,
-      statements: 100,
+  projects: [{
+    displayName: 'test',
+    collectCoverage: true,
+    collectCoverageFrom: ['lib/index.js'],
+    coverageDirectory: './coverage',
+    coverageThreshold: {
+      global: {
+        branches: 100,
+        functions: 100,
+        lines: 100,
+        statements: 100,
+      },
     },
-  },
-  testEnvironment: 'node',
-  verbose: true,
+    testEnvironment: 'node',
+    verbose: true,
+  }, {
+    runner: 'jest-runner-eslint',
+    displayName: 'linter',
+  }],
+  watchPlugins: ['jest-runner-eslint/watch-fix'],
 };
diff --git a/package.json b/package.json
index 0d2f030..2a942ed 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,9 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "lint": "eslint lib test --fix",
-    "test": "npm run lint && jest --ci",
+    "test": "is-ci 'test:ci' 'test:local'",
+    "test:local": "jest --watch",
+    "test:ci": "jest --ci",
     "benchmark": "node benchmarks/index"
   },
   "repository": {
@@ -35,13 +36,15 @@
     "artificial": "0.1.x",
     "benchmark": "2.1.4",
     "body-parser": "1.18.2",
-    "eslint": "4.19.x",
-    "eslint-config-airbnb-base": "12.1.x",
-    "eslint-plugin-import": "2.11.x",
+    "eslint": "5.x.x",
+    "eslint-config-airbnb-base": "13.x.x",
+    "eslint-plugin-import": "2.x.x",
     "expect": "23.x.x",
     "express": "next",
     "faker": "4.1.x",
-    "jest": "23.x.x"
+    "is-ci-cli": "^1.1.1",
+    "jest": "23.x.x",
+    "jest-runner-eslint": "^0.7.1"
   },
   "engines": {
     "node": ">=8.9.0"
diff --git a/test/celebrate.test.js b/test/celebrate.test.js
index acdf631..25e9dbd 100644
--- a/test/celebrate.test.js
+++ b/test/celebrate.test.js
@@ -1,5 +1,6 @@
 /* eslint-env jest */
 const expect = require('expect');
+const { name, random, date } = require('faker');
 const {
   celebrate,
   Joi,
@@ -7,7 +8,6 @@ const {
   isCelebrate,
 } = require('../lib');
 
-const { name, random, date } = require('faker');
 
 describe('celebrate()', () => {
   describe.each`