diff --git a/.travis.yml b/.travis.yml
index 2e6d4a1c..903a4c58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -121,7 +121,7 @@ matrix:
         sources: ['ubuntu-toolchain-r-test']
         packages: [g++-4.9, valgrind]
     after_success:
-      - valgrind --error-exitcode=1 --leak-check=full test/json_unit * ;
+      - valgrind --error-exitcode=1 --leak-check=full test/json_unit "*" ;
 
   # Coveralls
 
@@ -282,132 +282,3 @@ script:
 #          branch_pattern: coverity_scan
 #      env: COMPILER=g++-5
 #
-#    - os: linux
-#      compiler: gcc
-#      addons:
-#        apt:
-#          sources: ['ubuntu-toolchain-r-test']
-#          packages: ['g++-6', 'valgrind']
-#      env: COMPILER=g++-6
-#
-#    # from https://github.com/travis-ci/travis-ci/issues/6120
-#    - os: linux
-#      env:
-#        - LLVM_VERSION=3.8.0
-#        - LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
-#        - COMPILER=clang++
-#        - CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1"
-#        - LDFLAGS=-lc++
-#        - PATH=$HOME/clang-$LLVM_VERSION/bin:$PATH
-#        - LD_LIBRARY_PATH=$HOME/clang-$LLVM_VERSION/lib:$LD_LIBRARY_PATH
-#      before_install:
-#       - wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH
-#       - mkdir $HOME/clang-$LLVM_VERSION
-#       - tar xf $LLVM_ARCHIVE_PATH -C $HOME/clang-$LLVM_VERSION --strip-components 1
-#
-#    # Clang 3.5 is not able to compile the code,
-#    # see https://travis-ci.org/nlohmann/json/jobs/126720186
-#
-##    - os: linux
-##      compiler: clang
-##      addons:
-##        apt:
-##          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
-##          packages: ['clang-3.6', 'valgrind']
-##      env: COMPILER=clang++-3.6
-##
-##    - os: linux
-##      compiler: clang
-##      addons:
-##        apt:
-##          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
-##          packages: ['clang-3.7', 'valgrind']
-##      env: COMPILER=clang++-3.7
-##
-##    - os: linux
-##      compiler: clang
-##      addons:
-##        apt:
-##          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.8']
-##          packages: ['clang-3.8', 'valgrind']
-##      env: COMPILER=clang++-3.8
-#
-#  #  - os: linux
-#  #    compiler: clang
-#  #    addons:
-#  #      apt:
-#  #        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise']
-#  #        packages: ['clang-3.9', 'valgrind']
-#  #    env: COMPILER=clang++-3.9
-#
-#    - os: osx
-#      osx_image: beta-xcode6.1
-#      compiler: clang
-#      env:
-#       - COMPILER=clang
-#       - CXXFLAGS=-lstdc++
-#
-#    - os: osx
-#      osx_image: beta-xcode6.2
-#      compiler: clang
-#      env:
-#       - COMPILER=clang
-#       - CXXFLAGS=-lstdc++
-#
-#    - os: osx
-#      osx_image: beta-xcode6.3
-#      compiler: clang
-#      env:
-#       - COMPILER=clang
-#       - CXXFLAGS=-lstdc++
-#
-#    - os: osx
-#      osx_image: xcode6.4
-#      compiler: clang
-#      env:
-#       - COMPILER=clang
-#       - CXXFLAGS=-lstdc++
-#
-#    - os: osx
-#      osx_image: xcode7.1
-#      compiler: clang
-#      env:
-#       - COMPILER=clang
-#       - CXXFLAGS=-lstdc++
-#     
-#    - os: osx
-#      osx_image: xcode7.2
-#      compiler: clang
-#      env:
-#       - COMPILER=clang
-#       - CXXFLAGS=-lstdc++
-#
-#    - os: osx
-#      osx_image: xcode7.3
-#      compiler: clang
-#      env:
-#       - COMPILER=clang
-#       - CXXFLAGS=-lstdc++
-#
-#    - os: osx
-#      osx_image: xcode8
-#      compiler: clang
-#      env:
-#       - COMPILER=clang
-#       - CXXFLAGS=-lstdc++
-#
-#script:
-#  - uname -a
-#  - $COMPILER --version
-#  - make CXX=$COMPILER
-#  - test/json_unit "*"
-#  - if [ `which valgrind` ]; then
-#    valgrind --error-exitcode=1 --leak-check=full test/json_unit ;
-#    fi
-#  - if [ `which brew` ]; then
-#    brew update ;
-#    brew tap nlohmann/json ;
-#    brew install nlohmann_json --HEAD ;
-#    brew test nlohmann_json ;
-#    fi
-#
\ No newline at end of file