diff --git a/.editorconfig b/.editorconfig
index 219985c..805ace9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,10 +1,3 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-
 [*]
 end_of_line = lf
 charset = utf-8
@@ -13,8 +6,13 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
+[*.{html,css,hbs,js}]
+indent_style = tab
+indent_size = tab
+tab_width = 4
+
 [*.hbs]
 insert_final_newline = false
 
-[*.{diff,md}]
+[*.md]
 trim_trailing_whitespace = false
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..1ad673f
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,9 @@
+/* eslint-env node */
+'use strict';
+
+module.exports = {
+	extends: 'eslint-config-bbva',
+	env: {
+		browser: true
+	}
+};
diff --git a/.gitignore b/.gitignore
index 373de6a..8537fae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
 /dist
 /tmp
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index d421faa..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "predef": [
-    "document",
-    "window",
-    "-Promise"
-  ],
-  "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/.travis.yml b/.travis.yml
index b3dfc66..c9229bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,4 +36,6 @@ install:
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
+  - node_modules/.bin/check-dependencies
+  - node_modules/.bin/eslint '**/*.js'
   - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 5ae9fca..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-machine:
-  node:
-    version: 6.9.0
-
-dependencies:
-  post:
-    - bower install
diff --git a/package.json b/package.json
index 544fd8d..d6e6396 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
+    "check-dependencies": "^1.1.0",
     "ember-ajax": "^2.4.1",
     "ember-cli": "2.9.1",
     "ember-cli-app-version": "^2.0.0",
@@ -38,6 +39,8 @@
     "ember-load-initializers": "^0.5.1",
     "ember-resolver": "^2.0.3",
     "ember-welcome-page": "^1.0.3",
+    "eslint": "^3.0.0",
+    "eslint-config-bbva": "^2.0.0",
     "loader.js": "^4.0.10"
   },
   "keywords": [
diff --git a/testem.js b/testem.js
index 26044b2..486a40a 100644
--- a/testem.js
+++ b/testem.js
@@ -1,13 +1,23 @@
-/*jshint node:true*/
+/* eslint-env node */
+'use strict';
+
 module.exports = {
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "PhantomJS"
-  ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
-  ]
+	framework: 'qunit',
+	test_page: 'tests/index.html?hidepassed',
+	disable_watching: true,
+	browser_start_timeout: 180,
+	launch_in_ci: [
+		'Chrome'
+	],
+	launch_in_dev: [
+		'Chrome'
+	],
+	browser_args: {
+		Chrome: [
+			'--headless',
+			'--disable-gpu',
+			'--remote-debugging-port=9222',
+			'--window-size=1440,900'
+		]
+	}
 };
diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js
new file mode 100644
index 0000000..0c6d9b3
--- /dev/null
+++ b/tests/.eslintrc.js
@@ -0,0 +1,8 @@
+/* eslint-env node */
+'use strict';
+
+module.exports = {
+	env: {
+		embertest: true
+	}
+};
diff --git a/tests/.jshintrc b/tests/.jshintrc
deleted file mode 100644
index d2bd113..0000000
--- a/tests/.jshintrc
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "predef": [
-    "document",
-    "window",
-    "location",
-    "setTimeout",
-    "$",
-    "-Promise",
-    "define",
-    "console",
-    "visit",
-    "exists",
-    "fillIn",
-    "click",
-    "keyEvent",
-    "triggerEvent",
-    "find",
-    "findWithAssert",
-    "wait",
-    "DS",
-    "andThen",
-    "currentURL",
-    "currentPath",
-    "currentRouteName"
-  ],
-  "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
-}