diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000..7f6c036
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,6 @@
+node_modules/**
+app/node_modules/**
+app/lib/**
+lib/**
+built-tests/**
+coverage/**
diff --git a/gulp/ci.js b/gulp/ci.js
deleted file mode 100644
index c2c8f02..0000000
--- a/gulp/ci.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import gulp from 'gulp';
-import runSequence from 'run-sequence';
-
-gulp.task('ci', callback => {
-    return runSequence('test', 'lint', callback);
-});
diff --git a/gulp/tests/lint.js b/gulp/tests/lint.js
deleted file mode 100644
index e748aa5..0000000
--- a/gulp/tests/lint.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import gulp from 'gulp';
-import eslint from 'gulp-eslint';
-
-gulp.task('lint', () => {
-    return gulp.src(['**/*.js', '!node_modules/**', '!app/node_modules/**', '!app/lib/**', '!lib/**', '!built-tests/**', '!coverage/**'])
-        .pipe(eslint())
-        .pipe(eslint.format())
-        .pipe(eslint.failAfterError());
-});
diff --git a/package.json b/package.json
index 1f0be98..9207aed 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,8 @@
   "scripts": {
     "dev-up": "npm install && (cd app && npm install) && npm run build",
     "test": "gulp test",
-    "lint": "gulp lint",
-    "ci": "gulp ci",
+    "lint": "eslint .",
+    "ci": "gulp test && npm run lint",
     "clean": "gulp clean",
     "build": "gulp build",
     "watch": "while true ; do gulp watch ; done",
@@ -69,10 +69,10 @@
     "babel-register": "^6.6.0",
     "chai": "^3.4.1",
     "del": "^2.2.0",
+    "eslint": "^2.10.2",
     "eslint-config-google": "^0.5.0",
     "gulp": "^3.9.0",
     "gulp-babel": "^6.1.1",
-    "gulp-eslint": "^2.0.0",
     "gulp-istanbul": "^0.10.3",
     "gulp-mocha": "^2.2.0",
     "gulp-sourcemaps": "^1.6.0",