diff --git a/.travis.yml b/.travis.yml
index c9bef1b0..0b5d74de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ addons:
       - ubuntu-toolchain-r-test
       - llvm-toolchain-precise-3.8
     packages:
-#     - gcc-5
-#     - g++-5
+      - gcc-5
+      - g++-5
       - clang-3.8
 
 env:
@@ -36,11 +36,11 @@ before_install:
 
   # Install packages : core
   #--------------------------------------------------------------------------x
-  - sudo apt-get install -y libc++-dev libc++abi-dev cmake cmake-data libcppunit-dev libboost-dev libfreetype6-dev
+  - sudo apt-get install -y cmake cmake-data libboost-dev
 
   # Install packages : xcb
   #--------------------------------------------------------------------------x
-  - sudo apt-get install -y libxcb1-dev libxcb-util0-dev libxcb-randr0-dev libxcb-ewmh-dev libxcb-icccm4-dev xcb-proto python-xcbgen
+  - sudo apt-get install -y libxcb1-dev libxcb-util0-dev libxcb-randr0-dev libxcb-ewmh-dev libxcb-icccm4-dev xcb-proto python-xcbgen libfreetype6-dev
 
   # Install packages : optional
   #--------------------------------------------------------------------------x
@@ -57,15 +57,6 @@ install:
   #--------------------------------------------------------------------------x
   - export PYTHONPATH="/usr/lib/python2.7/dist-packages:${PYTHONPATH}"
 
-  # Install jsoncpp
-  #--------------------------------------------------------------------------x
-  - |
-    cd "${DEPS_DIR}"
-    tar -zxf ../lib/jsoncpp-1.7.7.tar.gz -C .
-    mkdir -p jsoncpp-1.7.7/build && cd jsoncpp-1.7.7/build
-    cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-    sudo make install
-
   # Install a later version of cmake
   #--------------------------------------------------------------------------x
   - |
@@ -83,17 +74,21 @@ install:
       travis_retry wget --quiet -O - "${LLVM_URL}" | tar --strip-components=1 -xJ -C "${LLVM_ROOT}"
       travis_retry wget --quiet -O - "${LIBCXX_URL}" | tar --strip-components=1 -xJ -C "${LLVM_ROOT}/projects/libcxx"
       travis_retry wget --quiet -O - "${LIBCXXABI_URL}" | tar --strip-components=1 -xJ -C "${LLVM_ROOT}/projects/libcxxabi"
-      (cd "${LLVM_ROOT}/build" && cmake .. -DCMAKE_CXX_COMPILER="${CXX}" -DCMAKE_C_COMPILER="${CC}" -DCMAKE_INSTALL_PREFIX="${LLVM_ROOT}/install" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}")
+      (cd "${LLVM_ROOT}/build" && cmake .. -DCMAKE_CXX_COMPILER=clang++ && make cxxabi cxx -j2)
       (cd "${LLVM_ROOT}/build/projects/libcxx" && make install)
       (cd "${LLVM_ROOT}/build/projects/libcxxabi" && make install)
-      export CXXFLAGS="${CXXFLAGS} -I ${LLVM_ROOT}/install/include/c++/v1"
-      export LDFLAGS="${LDFLAGS} -L ${LLVM_ROOT}/install/lib -lc++ -lc++abi"
+      export CXXFLAGS="${CXXFLAGS} -I${LLVM_ROOT}/install/include"
+      export CXXFLAGS="${CXXFLAGS} -I${LLVM_ROOT}/install/include/c++/v1"
+      export CXXFLAGS="${CXXFLAGS} -stdlib=libc++"
+      export LDFLAGS="${LDFLAGS} -L${LLVM_ROOT}/install/lib"
+      export LDFLAGS="${LDFLAGS} -lc++"
+      export LDFLAGS="${LDFLAGS} -lc++abi"
       export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${LLVM_ROOT}/install/lib"
     fi
 
   # Set compiler's
   #--------------------------------------------------------------------------x
-  - if [[ "${CXX}" == "clang++" ]]; then export CXX="clang++-3.8" CC="clang-3.8" CXXFLAGS="${CXXFLAGS} -Qunused-arguments"; fi
+  - if [[ "${CXX}" == "clang++" ]]; then export CXX="clang++-3.8" CC="clang-3.8"; fi
 # - if [[ "${CXX}" == "g++" ]]; then export CXX="g++-5" CC="gcc-5"; fi
 
 before_script: