diff --git a/.travis.yml b/.travis.yml
index 074779c9..978ab637 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
+# Project specific config
 language: ruby
 rvm:
-  - 2.2.3
+  - 2.3.1
 
 os:
   - linux
@@ -13,9 +14,14 @@ env:
 
 install:
   - gem install rubocop
+  # Installed for linting the project
+  - nvm install 6
 
 before_script:
+  - node --version
   - rubocop --version
+
+# Generic setup follows
 script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
 
 notifications:
@@ -23,6 +29,10 @@ notifications:
     on_success: never
     on_failure: change
 
+branches:
+  only:
+    - master
+
 git:
   depth: 10
 
@@ -35,7 +45,3 @@ addons:
     - git
     - libgnome-keyring-dev
     - fakeroot
-
-branches:
-  only:
-    - master
diff --git a/appveyor.yml b/appveyor.yml
index 06ec601f..19a7b0a4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,21 +4,23 @@ platform: x64
 
 environment:
   APM_TEST_PACKAGES:
-  RUBY_VERSION: 22-x64
+  RUBY_VERSION: 23-x64
   matrix:
     - ATOM_CHANNEL: stable
     - ATOM_CHANNEL: beta
 
 install:
-  - ps: Install-Product node 5
+  - ps: Install-Product node 6
   - SET PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
   - gem update --system
   - gem install rubocop --no-document
 
 before_build:
+  - node --version
   - ruby --version
   - gem --version
   - rubocop --version
+
 build_script:
   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))
 
@@ -28,3 +30,5 @@ branches:
 
 deploy: off
 test: off
+clone_depth: 10
+skip_tags: true
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..8851f572
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,24 @@
+dependencies:
+  override:
+    - gem update --system
+    - gem install rubocop --no-document
+    - curl -L https://atom.io/download/deb -o atom-amd64.deb
+    - sudo dpkg --install atom-amd64.deb || true
+    - sudo apt-get update
+    - sudo apt-get -f install
+    - apm install
+test:
+  override:
+    - node --version
+    - gem --version
+    - rubocop --version
+    - atom -v
+    - apm -v
+    - npm run lint
+    - apm test
+
+machine:
+  node:
+    version: 6
+  ruby:
+    version: 2.3.1
diff --git a/package.json b/package.json
index 0ae3d882..0d5c93f6 100644
--- a/package.json
+++ b/package.json
@@ -17,9 +17,9 @@
   },
   "devDependencies": {
     "coffeelint": "^1.15.0",
-    "eslint": "^2.9.0",
-    "eslint-config-airbnb-base": "^3.0.0",
-    "eslint-plugin-import": "^1.7.0"
+    "eslint": "^3.0.1",
+    "eslint-config-airbnb-base": "^4.0.0",
+    "eslint-plugin-import": "^1.10.2"
   },
   "providedServices": {
     "linter": {