diff --git a/.travis.yml b/.travis.yml
index a8192d9..cc82541 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-language: c
+language: generic
 
 sudo: false
 
@@ -6,31 +6,27 @@ matrix:
   include:
     - os: linux
       compiler: gcc
-      env: COVERAGE=gcov-4.9
+      env: COVERAGE=gcov-4.9 CC="gcc-4.9" CXX="g++-4.9"
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: [ 'g++-4.9', 'protobuf-compiler', 'libprotobuf-dev' ]
+          packages: [ 'g++-4.9' ]
     - os: linux
       compiler: clang
+      env: CC="clang-3.5" CXX="clang++-3.5"
       addons:
         apt:
-          packages: [ 'protobuf-compiler', 'libprotobuf-dev', 'libc++-dev' ]
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
+          packages: [ 'clang-3.5' ]
     - os: osx
       compiler: clang
 
 
 install:
- - if [[ $(uname -s) == 'Darwin' ]]; then brew install protobuf; fi;
  - if [ -n "${COVERAGE}" ]; then
-       export CXX=g++-4.9;
-       export CC=gcc-4.9;
        export CXXFLAGS="--coverage -g";
        export CFLAGS="--coverage -g";
        export LDFLAGS="--coverage";
-   elif [[ $(uname -s) == 'Linux' ]]; then
-       export CXX=clang++;
-       export CXXFLAGS="-stdlib=libc++";
    fi;
  - make