diff --git a/.travis.yml b/.travis.yml
index 93d74a5e8..97032013f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,50 +81,55 @@ install:
 
 script:
 
+
+  - cd docs
   - 'if [[ "$docs" == "1" && $TRAVIS_OS_NAME == "osx" ]]; then
-    cd docs;
-    make RST2HTML=rst2html.py;
-    cd ..;
+      make RST2HTML=rst2html.py;
     fi'
+  - cd ..
 
 # if variant is not set, we do not want to build anything
 # if we are building with code coverage, report it as soon as possible
+  - cd test
   - 'if [ "$variant" != "" ]; then
-      cd test;
-      bjam --hash -j3 warnings-as-errors=on variant=$variant -l900 $coverage_toolset $target;
+      bjam --hash -j3 warnings-as-errors=on variant=$variant -l900 $coverage_toolset $target &&
       if [[ $TRAVIS_OS_NAME == "linux" && "$coverage" == "1" ]]; then
         codecov --root .. --gcov-exec gcov-4.8;
       fi;
-      cd ../examples;
-      bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset link=shared bt-get bt-get2;
-      cd ..;
     fi'
 
+  - cd ../examples
+  - 'if [ "$variant" != "" ]; then
+      bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset link=shared;
+    fi'
+  - cd ..
+
 # build libtorrent separately and install it in a temporary (well known) dir
 # we have to do this because on linux the name of the python module is the same
 # as the main library, so we cannot stage them to the same directory
 # here we specify the temporary lib dir as a path to look for the main library
   - 'if [ "$variant" != "" ]; then
       bjam --hash -j3 warnings-as-errors=on link=shared variant=$variant $toolset install location=./lib;
-      cd bindings/python;
-      bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset stage_module libtorrent-link=shared install-type=LIB dll-path=../../lib;
-      LD_LIBRARY_PATH=../../lib DYLD_LIBRARY_PATH=../../lib python test.py;
-      cd ../..;
     fi'
 
-# simulation
+  - cd bindings/python
   - 'if [ "$variant" != "" ]; then
-      cd simulation;
-      if [ "$sim" == "1" ]; then
-        bjam --hash -j2 crypto=built-in warnings-as-errors=on $coverage_toolset;
-      fi;
-      cd ..;
+      bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset stage_module libtorrent-link=shared install-type=LIB dll-path=../../lib &&
+      LD_LIBRARY_PATH=../../lib DYLD_LIBRARY_PATH=../../lib python test.py;
     fi'
+  - cd ../..;
+
+# simulation
+  - cd simulation
+  - 'if [ "$variant" != "" && "$sim" == "1" ]; then
+      bjam --hash -j2 crypto=built-in warnings-as-errors=on $coverage_toolset;
+    fi'
+  - cd ..
 
 # run cppcheck if enabled
   - 'if [[ "$analyze" == "1" ]]; then
        if [[ $TRAVIS_OS_NAME == "linux" ]]; then
-         cppcheck --version;
+         cppcheck --version &&
          find src -type f | grep ".*\.cpp$" >cppcheck.files;
          cppcheck -DTORRENT_USE_IPV6="1" -DTORRENT_USE_I2P="1"
            -DTORRENT_USE_OPENSSL="1" -DTORRENT_USE_INVARIANT_CHECKS="1"