diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000..4ebc8aea
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+coverage
diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 00000000..6406ac9c
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,13 @@
+{
+  "extends": "loopback",
+  "rules": {
+    "max-len": ["error", 110, 4, {
+      "ignoreComments": true,
+      "ignoreUrls": true,
+      "ignorePattern": "^\\s*var\\s.+=\\s*(require\\s*\\()|(/)"
+    }],
+    // NOTE(bajtos) we should eventuall remove this override
+    // and fix all of those 100+ violations
+    "one-var": "off"
+  }
+}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 92b148b1..00000000
--- a/.jshintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-support/nodeunit
diff --git a/package.json b/package.json
index 03609823..3fde290c 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,9 @@
     "clean": "make clean",
     "help": "make help",
     "refresh": "make refresh",
-    "test": "make test"
+    "test": "make test",
+    "posttest": "npm run lint",
+    "lint": "eslint ."
   },
   "engines": [
     "node >= 0.6"
@@ -41,6 +43,8 @@
     "bluebird": "^3.1.1",
     "debug": "^2.1.1",
     "depd": "^1.0.0",
+    "eslint": "^2.5.3",
+    "eslint-config-loopback": "^1.0.0",
     "inflection": "^1.6.0",
     "loopback-connector": "^2.1.0",
     "node-uuid": "^1.4.2",
diff --git a/test/.eslintrc b/test/.eslintrc
new file mode 100644
index 00000000..f279c3ba
--- /dev/null
+++ b/test/.eslintrc
@@ -0,0 +1,7 @@
+{
+  "rules": {
+    // NOTE(bajtos) We should eventually get rid of this override,
+    // and fix those 200+ violations instead
+    "padded-blocks": "off"
+  }
+}