diff --git a/.travis.yml b/.travis.yml
index 580ee48a..214e2c41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,17 +28,17 @@ matrix:
   include:
       # trusty default (gcc 4.8.4)
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11,1y
+      env: TOOLSET=gcc CXXSTD=03,11,1y
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
+      env: TOOLSET=gcc-4.7 CXXSTD=03,11
       addons:
         apt:
           packages:
             - g++-4.7
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11,1y
+      env: TOOLSET=gcc-4.8 CXXSTD=03,11,1y
       addons:
         apt:
           packages:
@@ -47,7 +47,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11,1y
+      env: TOOLSET=gcc-4.9 CXXSTD=03,11,1y
       addons:
         apt:
           packages:
@@ -56,7 +56,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14,1z
+      env: TOOLSET=gcc-5 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -65,7 +65,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z
+      env: TOOLSET=gcc-6 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -74,7 +74,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,1z
+      env: TOOLSET=gcc-7 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -84,10 +84,10 @@ matrix:
 
       # trusty default (clang 3.9.0)
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
+      env: TOOLSET=clang CXXSTD=03,11,14,1z
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang-3.5 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -96,7 +96,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang-3.6 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -106,7 +106,7 @@ matrix:
             - llvm-toolchain-precise-3.6
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang-3.7 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -116,7 +116,7 @@ matrix:
             - llvm-toolchain-precise-3.7
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang-3.8 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -125,7 +125,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang-3.9 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -134,7 +134,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
+      env: TOOLSET=clang-4.0 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -191,6 +191,4 @@ install:
   - ./b2 headers
 
 script:
-  - |-
-    echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
   - ./b2 libs/fusion/test toolset=$TOOLSET cxxstd=$CXXSTD define=RUNNING_ON_TRAVIS=1