diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3454f6c..0c959193 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Version 104:
 
 * Remove unused include
 * Use #error in config.hpp
+* Only set -std=c++11 on Travis
 
 --------------------------------------------------------------------------------
 
diff --git a/Jamfile b/Jamfile
index c5ab4514..7f87e59d 100644
--- a/Jamfile
+++ b/Jamfile
@@ -99,8 +99,6 @@ project /boost/beast
     <define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1
     <define>BOOST_ASIO_DISABLE_BOOST_REGEX=1
     <define>BOOST_ASIO_NO_DEPRECATED=1
-    <toolset>gcc:<cxxflags>-std=c++11
-    <toolset>clang:<cxxflags>-std=c++11
     <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
     <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
     <toolset>msvc:<cxxflags>"/permissive- /bigobj"
diff --git a/build/build-and-test.sh b/build/build-and-test.sh
index 456e7f9e..884f1883 100755
--- a/build/build-and-test.sh
+++ b/build/build-and-test.sh
@@ -100,7 +100,8 @@ function build_bjam ()
   if [[ $VARIANT == "coverage" ]] || \
      [[ $VARIANT == "valgrind" ]] || \
      [[ $VARIANT == "ubasan" ]]; then
-    bjam \
+    b2 \
+      cxxflags=-std=c++11 \
       libs/beast/test/beast/core//fat-tests \
       libs/beast/test/beast/http//fat-tests \
       libs/beast/test/beast/websocket//fat-tests \
@@ -109,7 +110,8 @@ function build_bjam ()
       variant=$VARIANT \
       -j${JOBS}
   else
-    bjam \
+    b2 \
+      cxxflags=-std=c++11 \
       libs/beast/test//fat-tests \
       libs/beast/example \
       toolset=$TOOLSET \