diff --git a/.travis.yml b/.travis.yml
index 377ec51..afc8f5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,12 +38,12 @@ env:
         - BOOST_REMOVE=$(basename $TRAVIS_BUILD_DIR)
 
     matrix:
-        - CXX_FLAGS="cxxflags=\'--coverage -DBOOST_TRAVISCI_BUILD -std=c++98\' linkflags=--coverage" TOOLSET=gcc
-        - CXX_FLAGS="cxxflags=\'--coverage -DBOOST_TRAVISCI_BUILD -std=c++11\' linkflags=--coverage" TOOLSET=gcc-5
-        - CXX_FLAGS="cxxflags=\'--coverage -DBOOST_TRAVISCI_BUILD -std=c++1y\' linkflags=--coverage" TOOLSET=gcc-5
-        - CXX_FLAGS="cxxflags=\'--coverage -DBOOST_TRAVISCI_BUILD -std=c++98 -stdlib=libc++\' linkfalgs=\'--coverage -stdlib=libc++\'" TOOLSET=clang
-        - CXX_FLAGS="cxxflags=\'--coverage -DBOOST_TRAVISCI_BUILD -std=c++11 -stdlib=libc++\' linkfalgs=\'--coverage -stdlib=libc++\'" TOOLSET=clang
-        - CXX_FLAGS="cxxflags=\'--coverage -DBOOST_TRAVISCI_BUILD -std=c++1y -stdlib=libc++\' linkfalgs=\'--coverage -stdlib=libc++\'" TOOLSET=clang
+        - CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++98" LINK_FLAGS=--coverage TOOLSET=gcc
+        - CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++11" LINK_FLAGS=--coverage TOOLSET=gcc-5
+        - CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++1y" LINK_FLAGS=--coverage TOOLSET=gcc-5
+        - CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++98 -stdlib=libc++" LINK_FLAGS="--coverage -stdlib=libc++" TOOLSET=clang
+        - CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++11 -stdlib=libc++" LINK_FLAGS="--coverage -stdlib=libc++" TOOLSET=clang
+        - CXX_FLAGS="--coverage -DBOOST_TRAVISCI_BUILD -std=c++1y -stdlib=libc++" LINK_FLAGS="--coverage -stdlib=libc++" TOOLSET=clang
 
 ###############################################################################################################
 # From this point and below code is same for all the Boost libs
@@ -91,7 +91,7 @@ before_install:
 
 script:
     # `--coverage` flags required to generate coverage info for Coveralls
-    - ../../../b2 testing.launcher=valgrind address-model=64 architecture=x86 toolset=$TOOLSET $CXX_FLAGS
+    - ../../../b2 testing.launcher=valgrind address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="$CXX_FLAGS" linkflags="$LINK_FLAGS"
 
 after_success:
     # Copying Coveralls data to a separate folder