diff --git a/.travis.yml b/.travis.yml
index cf00024..e727525 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,9 @@ language: cpp
 sudo: required
 dist: trusty
 
-compiler:
-  - gcc
-  - clang
-
-os:
-  - osx
-  - linux
+env:
+  global:  
+   - GTEST_DIR=${TRAVIS_BUILD_DIR}/gtest
 
 addons:
   apt:
@@ -18,36 +14,46 @@ addons:
     - llvm-toolchain-trusty-3.6
     packages: &native_deps
     - cmake
-    - qttools5-dev
-    - qttools5-dev-tools
+    - doxygen
+    - clang-3.6
     - libusb-1.0-0-dev
     - libfftw3-dev
     - libqt5qml5
-    - doxygen
+    - libgtest-dev
+    - libqt5opengl5-dev
+    - qtbase5-dev
+    - qttools5-dev
+    - qttools5-dev-tools
     - gcc-5
     - g++-5
-    - clang-3.6
+    - gcc-4.8
+    - g++-4.8
 
-# We construct a build matrix for two operating systems (linux, osx) and two compilers (gcc, clang)
+# We are testing
+# * linux with g++4.8 and g++5 and clang 3.6
+# * osx with clang 3.6
 matrix:
-  exclude:
-    - os: osx
-      compiler:
-        - gcc
-#  fast_finish: true
-  allow_failures:
-    - os: osx
+  include:
+    - compiler: gcc
+      env: CMAKE_CXX_COMPILER=g++-4.8
+      os: linux
+    - compiler: gcc
+      env: CMAKE_CXX_COMPILER=g++-5
+      os: linux
+    - compiler: clang
+      env: CMAKE_CXX_COMPILER=clang++-3.6
+      os: linux
+    - compiler: clang
+      env: CMAKE_CXX_COMPILER=clang++-3.6
+      os: osx
 
 before_install:
-    - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sudo apt-get install -qq libqt5opengl5-dev; fi
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install libusb fftw qt5; fi
 
 before_script:
-    - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "gcc" ]]; then export CXX="g++-5" CC="gcc-5"; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "clang" ]]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
     - mkdir build
     - cd build
-    - cmake ../
+    - cmake -DCMAKE_CXX_COMPILER=$CMAKE_CXX_COMPILER ../
 
 script:
     - make