diff --git a/.travis.yml b/.travis.yml
index d6eb09d9..955afab6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,26 @@ language: cpp
 sudo: false
 
 compiler:
+  - clang
   - gcc
 
 env:
   - COMPILER=g++-4.9
   - COMPILER=g++-5
-  - COMPILER=g++-mingw-w64-i686
   - COMPILER=clang-3.6
   - COMPILER=clang-3.7
 
+matrix:
+  exclude:
+    - compiler: clang
+      env: COMPILER=g++-4.9
+    - compiler: clang
+      env: COMPILER=g++-5
+    - compiler: gcc
+      env: COMPILER=clang-3.6
+    - compiler: gcc
+      env: COMPILER=clang-3.7
+
 addons:
   apt:
     sources:
@@ -22,7 +33,6 @@ addons:
     packages:
     - g++-4.9
     - g++-5
-    - g++-mingw-w64-i686
     - clang-3.6
     - clang-3.7
     - valgrind