diff --git a/.travis.yml b/.travis.yml
index be429bd3..84dd4d2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,77 @@
-# Ubuntu 14.04 Trusty support
-sudo: required
-dist: trusty
-# Enable C++ support
 language: cpp
-# Compiler selection
-# Build steps
-script:
-  - ./scripts/reconfigure_script
-  - mkdir build
-  - cd build
-  - ../configure CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" LIBS="-fopenmp -lmpfr -lgmp" --enable-precision=single --enable-simd=AVX2 --enable-comms=none 
-  - make 
-  - ./benchmarks/Benchmark_dwf --threads 1
+
 matrix:
   include:
-    - compiler: gcc-4.9
+    - os:        osx
+      osx_image: xcode7.2
+      compiler: clang
+    - os:        osx
+      osx_image: xcode7.2
+      compiler: gcc
+      env: VERSION=-5
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.7
+      env: VERSION=-4.7
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.8
+      env: VERSION=-4.8
+    - compiler: gcc
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
             - g++-4.9
-            - libmpfr-dev
-            - libgmp-dev
-            - libmpc-dev
-            - binutils-dev
-      env: CXX=g++-4.9
+      env: VERSION=-4.9
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-5
+      env: VERSION=-5
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.6
+          packages:
+            - clang-3.6
+      env: VERSION=-3.6
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.7
+          packages:
+            - clang-3.7
+      env: VERSION=-3.7
+      
+before_install:
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew update; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; fi
+  
+install:
+    - export CC=$CC$VERSION
+    - export CXX=$CXX$VERSION
+    
+script:
+    - ./scripts/reconfigure_script
+    - mkdir build
+    - cd build
+    - ../configure CXXFLAGS="-mavx2 -mfma -O3 -std=c++11" LIBS="-lmpfr -lgmp" --enable-precision=single --enable-simd=AVX2 --enable-comms=none
+    - make
+    - ./benchmarks/Benchmark_dwf --threads 1