diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000000..8dc61e26ea
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,10 @@
+{
+  "rules": {
+    "camelcase": [
+      2,
+      {
+        "properties": "always"
+      }
+    ]
+  }
+}
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000000..187cb653b8
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,16 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module'
+  },
+  extends: [
+    'eslint:recommended',
+    'plugin:ember-suave/recommended'
+  ],
+  env: {
+    'browser': true
+  },
+  rules: {
+  }
+};
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index b37e6067ff..0000000000
--- a/.jscsrc
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "preset": "ember-suave",
-  "disallowDirectPropertyAccess": null,
-  "disallowConstOutsideModuleScope": null,
-  "disallowMultipleVarDecl": null,
-  "disallowPrototypeExtension": null,
-  "disallowVar": null,
-  "requireArrayDestructuring": null,
-  "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
-  "requireCommentsToIncludeAccess": null,
-  "requireEnhancedObjectLiterals": null,
-  "requireObjectDestructuring": null,
-  "requireSpread": null,
-  "requireTemplateStringsForConcatenation": null
-}
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 5e2703396c..0000000000
--- a/.jshintrc
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "predef": [
-    "document",
-    "window",
-    "-Promise",
-    "Bloodhound",
-    "Filer",
-    "PouchDB",
-    "oauthSignature",
-    "OAuth",
-    "$",
-    "MediaStreamTrack",
-    "dymo",
-    "uuid",
-    "moment",
-    "Pikaday",
-    "Promise",
-    "logDebug",
-    "toolbox",
-    "self",
-    "Response"
-  ],
-  "browser": true,
-  "boss": true,
-  "curly": true,
-  "debug": false,
-  "devel": true,
-  "eqeqeq": true,
-  "evil": true,
-  "forin": false,
-  "immed": false,
-  "laxbreak": false,
-  "newcap": true,
-  "noarg": true,
-  "noempty": false,
-  "nonew": false,
-  "nomen": false,
-  "onevar": false,
-  "plusplus": false,
-  "regexp": false,
-  "undef": true,
-  "sub": true,
-  "strict": false,
-  "white": false,
-  "eqnull": true,
-  "esversion": 6,
-  "unused": true
-}
diff --git a/lib/.jshintrc b/lib/.jshintrc
deleted file mode 100644
index 839c191fa9..0000000000
--- a/lib/.jshintrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "node": true,
-  "browser": false
-}
diff --git a/package.json b/package.json
index c285dd5e86..bd33f5393e 100644
--- a/package.json
+++ b/package.json
@@ -46,11 +46,11 @@
     "ember-cli-content-security-policy": "0.5.0",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-deprecation-workflow": "0.2.3",
+    "ember-cli-eslint": "3.0.0",
     "ember-cli-fake-server": "0.3.1",
     "ember-cli-htmlbars": "^1.0.8",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-jshint": "^2.0.1",
     "ember-cli-qunit": "^3.0.0",
     "ember-cli-release": "^0.2.9",
     "ember-cli-sass": "^5.2.1",
@@ -73,6 +73,7 @@
     "ember-suave": "4.0.1",
     "ember-truth-helpers": "1.2.0",
     "ember-validations": "2.0.0-alpha.5",
+    "eslint-plugin-ember-suave": "^1.0.0",
     "express": "^4.8.5",
     "glob": "^7.1.0",
     "hospitalrun-dblisteners": "0.9.5",
diff --git a/server/.jshintrc b/server/.jshintrc
deleted file mode 100644
index c1f2978bcf..0000000000
--- a/server/.jshintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "node": true
-}
diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js
new file mode 100644
index 0000000000..9fc51320f0
--- /dev/null
+++ b/tests/.eslintrc.js
@@ -0,0 +1,5 @@
+module.exports = {
+  env: {
+    'embertest': true
+  }
+};
diff --git a/tests/.jshintrc b/tests/.jshintrc
deleted file mode 100644
index b5e137eae5..0000000000
--- a/tests/.jshintrc
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "predef": [
-    "authenticateSession",
-    "invalidateSession",
-    "currentSession",
-    "document",
-    "window",
-    "location",
-    "setTimeout",
-    "$",
-    "-Promise",
-    "define",
-    "console",
-    "visit",
-    "exists",
-    "fillIn",
-    "click",
-    "keyEvent",
-    "triggerEvent",
-    "find",
-    "findWithAssert",
-    "wait",
-    "DS",
-    "andThen",
-    "currentURL",
-    "currentPath",
-    "currentRouteName",
-    "runWithPouchDump",
-    "authenticateUser",
-    "waitToAppear",
-    "waitToDisappear",
-    "select",
-    "selectDate",
-    "typeAheadFillIn",
-    "moment"
-  ],
-  "node": false,
-  "browser": false,
-  "boss": true,
-  "curly": true,
-  "debug": false,
-  "devel": false,
-  "eqeqeq": true,
-  "evil": true,
-  "forin": false,
-  "immed": false,
-  "laxbreak": false,
-  "newcap": true,
-  "noarg": true,
-  "noempty": false,
-  "nonew": false,
-  "nomen": false,
-  "onevar": false,
-  "plusplus": false,
-  "regexp": false,
-  "undef": true,
-  "sub": true,
-  "strict": false,
-  "white": false,
-  "eqnull": true,
-  "esversion": 6,
-  "unused": true
-}