diff --git a/.travis.yml b/.travis.yml
index 450fd47..243c569 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,28 +48,28 @@ matrix:
       env: TOOLSET=gcc COMPILER=g++
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++11
+      env: TOOLSET=gcc COMPILER=g++-4.9
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++11
+      env: TOOLSET=gcc COMPILER=g++-5
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11
+      env: TOOLSET=gcc COMPILER=g++-6
 
     - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z
+      env: TOOLSET=gcc COMPILER=g++-6
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11
+      env: TOOLSET=clang COMPILER=clang++-3.6
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++11
+      env: TOOLSET=clang COMPILER=clang++-3.7
 
     - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11
+      env: TOOLSET=clang COMPILER=clang++-3.8
 
     - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11
+      env: TOOLSET=clang COMPILER=clang++
 
 install:
   - cd ..
@@ -86,7 +86,7 @@ install:
 
 script:
   - |-
-    echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD ;" > ~/user-config.jam
+    echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
   - ./b2 libs/exception/test toolset=$TOOLSET
 
 notifications:
diff --git a/test/exception_hpp_test.cpp b/test/exception_hpp_test.cpp
deleted file mode 100644
index 6f77efe..0000000
--- a/test/exception_hpp_test.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-//Copyright (c) 2006-2009 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/exception.hpp>
-#include <boost/exception.hpp>