diff --git a/.travis.yml b/.travis.yml
index 20cfe51..5eb4922 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-language: objective-c
-
 notifications:
   email:
     on_success: never
@@ -10,6 +8,28 @@ script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.
 git:
   depth: 10
 
+sudo: false
+
+os:
+  - linux
+  - osx
+
+env:
+  global:
+    - APM_TEST_PACKAGES=""
+
+  matrix:
+    - ATOM_CHANNEL=stable
+    - ATOM_CHANNEL=beta
+
+addons:
+  apt:
+    packages:
+    - build-essential
+    - git
+    - libgnome-keyring-dev
+    - fakeroot
+
 branches:
   only:
     - master