diff --git a/.travis.yml b/.travis.yml
index bec6fb9..91f6ed4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,4 @@
 # Project specific config
-language: node_js # For lint tools
-node_js: "5"
-
 os:
   - linux
   - osx
@@ -11,6 +8,10 @@ env:
     - ATOM_CHANNEL=stable
     - ATOM_CHANNEL=beta
 
+# Installed for linting the project
+language: node_js
+node_js: "6"
+
 # Generic setup follows
 script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
 
diff --git a/appveyor.yml b/appveyor.yml
index 5602846..80d0107 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,7 +16,7 @@ environment:
   - ATOM_CHANNEL: beta
 
 install:
-  - ps: Install-Product node 5 # For lint tools
+  - ps: Install-Product node 6 # For lint tools
 
 build_script:
   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))
diff --git a/circle.yml b/circle.yml
index 42801c6..44300b5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,6 +9,9 @@ test:
   override:
     - atom -v
     - apm -v
-    - ./node_modules/.bin/eslint lib
-    - ./node_modules/.bin/eslint spec
+    - npm run lint
     - apm test
+
+machine:
+  node:
+    version: 6