diff --git a/.travis.yml b/.travis.yml
index b46b1f386..596678236 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,33 +2,53 @@ env:
   global:
     - NYLAS_ACCESS_TOKEN=cb200be7c921f73a1c35930f6a4ac8758b271be0
 
-compiler: clang
+compiler:
+  - clang
+  - gcc
 
 matrix:
   include:
+# Wants a c++11 compiler
     - os: linux
-      env: NODE_VERSION=0.10
+      env: NODE_VERSION=0.10 CC=gcc-4.8 CXX=g++-4.8
     - os: linux
-      env: NODE_VERSION=0.12
+      env: NODE_VERSION=0.12 CC=gcc-4.8 CXX=g++-4.8
+    - os: linux
+      env: NODE_VERSION=4.2 CC=gcc-4.8 CXX=g++-4.8
+    - os: linux
+      env: NODE_VERSION=5 CC=gcc-4.8 CXX=g++-4.8
     - os: osx
       env: NODE_VERSION=0.10
     - os: osx
-      env: NODE_VERSION=0.12
+      env: NODE_VERSION=0.12 CC=clang CXX=clang++
+# osx already supports c++11 in Apple LLVM
+    - os: osx
+      env: NODE_VERSION=4.2 CC=clang CXX=clang++
+    - os: osx
+      env: NODE_VERSION=5 CC=clang CXX=clang++
 
 sudo: false
 
 install:
+  - echo $CC
+  - echo $CXX
+  - clang --version
+  - if [ "$CC" = "gcc-4.8" ]; then gcc-4.8 -v; else gcc -v; fi
   - git clone https://github.com/creationix/nvm.git /tmp/.nvm
   - source /tmp/.nvm/nvm.sh
   - nvm install $NODE_VERSION
-  - nvm use $NODE_VERSION
+  - nvm use --delete-prefix $NODE_VERSION
 
 script: script/cibuild
 
 addons:
   apt:
+    sources:
+    - ubuntu-toolchain-r-test
     packages:
     - build-essential
+    - clang
+    - fakeroot
+    - g++-4.8
     - git
     - libgnome-keyring-dev
-    - fakeroot