diff --git a/.travis.yml b/.travis.yml
index eb2f37c..ecfc135 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,49 @@
-sudo: false
-
+# Use new trusty images, should yield newer compilers and packages
+sudo: required
+dist: precise
 language: cpp
 
-compiler:
-  - clang
-  - gcc
-
-branches:
-  only:
-    - master
-
+matrix:
+  include:
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
+      env: COMPILER=g++-4.9
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-5
+      env: COMPILER=g++-5
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.6
+          packages:
+            - clang-3.6
+      env: COMPILER=clang++-3.6
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.7
+          packages:
+            - clang-3.7
+      env: COMPILER=clang++-3.7
+
+before_install:
+  - sudo apt-get update -qq
+  #- sudo apt-get install -y libopencv-dev
 script:
-  - make
-  - make clean
-
-before_deploy:
-
-deploy:
-
-after_deploy:
-
+  - mkdir build
+  - cd build
+  - cmake -DCMAKE_CXX_COMPILER=$COMPILER .. && make
\ No newline at end of file