diff --git a/.travis.yml b/.travis.yml
index c493afe..1bd83aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
-language: cpp
+language:
+  - cpp
+
+sudo: false
 
 compiler:
   - clang
@@ -8,7 +11,22 @@ os:
   - linux
   - osx
 
-before_script: 
+branches:
+  only:
+    - master
+    - dev
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.9
+
+install:
+  - pip install --user lutin
+
+before_script:
   - cd ..
   - git clone https://github.com/generic-library/gtest-lutin.git
   - git clone https://github.com/atria-soft/etk.git
@@ -16,19 +34,10 @@ before_script:
   - pwd
   - ls -l
   - if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi
+  - if [ "$CXX" == "g++" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi
 
-install:
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq g++-4.9
-  - sudo apt-get install -qq libstdc++-4.9-dev
-  - sudo rm /usr/bin/gcc /usr/bin/g++
-  - sudo ln -s /usr/bin/gcc-4.9 /usr/bin/gcc
-  - sudo ln -s /usr/bin/g++-4.9 /usr/bin/g++
-  - sudo pip install lutin
-
-script: 
-  - lutin -C -P -c$BUILDER -mdebug -p audio-algo-chunkware-test
+script:
+  - lutin -C -P -c$BUILDER $COMPILATOR_OPTION -mdebug -p audio-algo-chunkware-test
 #  - ./out/Linux_x86_64/debug/staging/$BUILDER/audio-algo-chunkware-test/usr/bin/audio-algo-chunkware-test -l6
 
 notifications: