diff --git a/.travis.yml b/.travis.yml
index c4981310..caf67050 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,20 +2,20 @@ language: cpp
 
 matrix:
   include:
-    - os: linux
-      env: COMPILER=icc   CMAKE_BUILD_TYPE=Debug
-    - os: linux
-      env: COMPILER=gcc   CMAKE_BUILD_TYPE=Debug
-    - os: linux
-      env: COMPILER=clang CMAKE_BUILD_TYPE=Debug
+#    - os: linux
+#      env: COMPILER=icc   CMAKE_BUILD_TYPE=Debug
+#    - os: linux
+#      env: COMPILER=gcc   CMAKE_BUILD_TYPE=Debug
+#    - os: linux
+#      env: COMPILER=clang CMAKE_BUILD_TYPE=Debug
     - os: osx
       env: COMPILER=clang CMAKE_BUILD_TYPE=Debug
-    - os: linux
-      env: COMPILER=icc   CMAKE_BUILD_TYPE=Release
-    - os: linux
-      env: COMPILER=gcc   CMAKE_BUILD_TYPE=Release
-    - os: linux
-      env: COMPILER=clang CMAKE_BUILD_TYPE=Release
+#    - os: linux
+#      env: COMPILER=icc   CMAKE_BUILD_TYPE=Release
+#    - os: linux
+#      env: COMPILER=gcc   CMAKE_BUILD_TYPE=Release
+#    - os: linux
+#      env: COMPILER=clang CMAKE_BUILD_TYPE=Release
     - os: osx
       env: COMPILER=clang CMAKE_BUILD_TYPE=Release
 
@@ -31,20 +31,19 @@ install:
       brew upgrade cmake
     fi
   - |
-    if [ $COMPILER == icc ]; then 
+    if [ $COMPILER == 'icc' ]; then 
       wget "https://raw.githubusercontent.com/nemequ/icc-travis/master/install-icc.sh"
       sudo sh install-icc.sh
       source ~/.bashrc
       export CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_CXX_COMPILER=icpc -DCMAKE_C_COMPILER=icc"
     fi
   - |
-    if [ $COMPILER == clang ]; then
+    if [ $COMPILER == 'clang' ]; then
       export CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang"
     fi
 
 script:
   - |
-    srcdir='..'
     mkdir build
     cd build
     cmake $CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_DOC=ON -DBUILD_TESTING=ON -DDISABLE_REFMAN_PDF=ON ..
@@ -53,20 +52,17 @@ script:
   
   - export CTEST_OUTPUT_ON_FAILURE=1
   - |
-    if [ $COMPILER != icc ]; then 
+    if [ $COMPILER != 'icc' ]; then 
       make check-testsuite     # Build and check the testsuite
       make check-examples      # Build and check the examples
       # TODO! (fails with error: no such file or directory: 'arrdaxpyf.o')
       # - make check-benchmarks    # Build and check the benchmarks (takes a long time)
       make blitz-doc
       sudo make install        # Install Blitz++
+      cd .. # build
+      pip install GitPython
+      travis-ci/check-wiki-examples.py
     fi
 
-  - |
-    if [ "${TRAVIS_OS_NAME}" == 'linux' ]; then
-       LD_LIBRARY_PATH=/usr/local/lib ${srcdir}/travis-ci/check-wiki-examples.py
-    fi
-
-
 after_script:
   - if [ $COMPILER == icc ]; then '[[ ! -z "${INTEL_INSTALL_PATH}" ]] && uninstall_intel_software'; fi