diff --git a/.travis.yml b/.travis.yml
index 86817a4..f8bcba9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ os:
 matrix:
   include:
     - os: linux
-      env: COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5
+      env: COMPILER=g++-5
       addons:
         apt:
           packages:
@@ -15,11 +15,12 @@ matrix:
             - llvm-toolchain-precise-3.8
             - ubuntu-toolchain-r-test
     - os: linux
-      env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8
+      env: COMPILER=clang++-3.8
       addons:
         apt:
           packages:
             - clang-3.8
           sources: *sources
-script: cmake -DCXXOPTS_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=$COMPILER_NAME \
-  . && make && make ARGS=--output-on-failure test
+script: 
+  | cmake -DCXXOPTS_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=$COMPILER . \
+    && make && make ARGS=--output-on-failure test