diff --git a/.travis.yml b/.travis.yml
index f39f11e266..da8ad02421 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,35 +4,6 @@ env:
   - SETUP_MODE=update
   - SETUP_MODE=install
 
-services:
-  - mysql
-  - memcached
-  - redis
-
-before_install:
-  - sudo apt-get purge elasticsearch
-  - >
-    wget --no-check-certificate https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb &&
-    sudo dpkg -i --force-confnew elasticsearch-1.3.2.deb
-  - sudo /usr/share/elasticsearch/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.3.0
-  - sudo service elasticsearch start
-
-before_script:
-  - node --version
-  - npm --version
-  - travis_retry npm install
-  - phpenv config-rm xdebug.ini
-  - echo 'session.cache_limiter = ""' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-  - echo 'extension="redis.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/redis.ini
-  - echo 'extension="memcache.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/memcache.ini
-  - echo 'extension="memcached.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/memcached.ini
-  - echo "extension=zmq.so" > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/zmq.ini
-  - yes | pecl install imagick
-  - mysql -e 'create database update39_test;create database ab_test;create database db_test;'
-  - mysql -e 'SET @@global.sql_mode= STRICT_ALL_TABLES;'
-  - mysql -e 'SET @@global.max_allowed_packet= 33554432;'
-  - mysql -e 'SET @@global.wait_timeout= 999999;'
-
 php:
   - 5.5
   - 5.6
@@ -40,22 +11,54 @@ php:
 matrix:
   fast_finish: true
 
-script:
+services:
+  - mysql
+  - memcached
+  - redis
+
+before_install:
+  - composer self-update
+  - sudo apt-get purge elasticsearch
+  - >
+    wget --no-check-certificate https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb &&
+    sudo dpkg -i --force-confnew elasticsearch-1.3.2.deb
+  - sudo /usr/share/elasticsearch/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.3.0
+  - sudo service elasticsearch start
+
+  - echo 'session.cache_limiter = ""' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - echo 'extension="redis.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/redis.ini
+  - echo 'extension="memcache.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/memcache.ini
+  - echo 'extension="memcached.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/memcached.ini
+  - echo "extension=zmq.so" > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/zmq.ini
+  - yes | pecl install imagick
+
+install:
   - travis_retry composer install --optimize-autoloader --dev --prefer-source
   - travis_retry grunt install-assets
-  - bin/developer assets:compile-less
-  - bin/developer system:uninstall
-  - bin/setup system:install --email=test@phraseanet.com --password=test --db-user=root --db-template=fr --db-password= --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y;
+  - ./bin/developer assets:compile-less
+
+before_script:
+  - node --version
+  - npm --version
+  - travis_retry npm install
+  - mysql -e 'create database update39_test;create database ab_test;create database db_test;'
+  - mysql -e 'SET @@global.sql_mode= STRICT_ALL_TABLES;'
+  - mysql -e 'SET @@global.max_allowed_packet= 33554432;'
+  - mysql -e 'SET @@global.wait_timeout= 999999;'
+
+script:
+  - ./bin/developer system:uninstall
+  - ./bin/setup system:install --email=test@phraseanet.com --password=test --db-user=root --db-template=fr --db-password= --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y;
   - mysql -e 'SELECT version FROM ab_test.sitepreff \G'
   - mysql -e 'SELECT * FROM db_test.pref WHERE prop = "version" \G'
   - >
-    sh -c "if [ '$SETUP_MODE' = 'update' ]; then
-      bin/developer ini:reset --email=test@phraseanet.com --password=test --run-patches --no-setup-dbs;
+    if [ "$SETUP_MODE" = "update" ]; then
+      ./bin/developer ini:reset --email=test@phraseanet.com --password=test --run-patches --no-setup-dbs;
       php resources/hudson/cleanupSubdefs.php;
-    fi"
-  - bin/developer ini:setup-tests-dbs
-  - bin/console searchengine:index:create
-  - bin/developer phraseanet:regenerate-sqlite
-  - bin/developer phraseanet:generate-js-fixtures
+    fi
+  - ./bin/developer ini:setup-tests-dbs
+  - ./bin/console searchengine:index:create
+  - ./bin/developer phraseanet:regenerate-sqlite
+  - ./bin/developer phraseanet:generate-js-fixtures
   - ./node_modules/.bin/grunt test
-  - bin/phpunit
+  - ./bin/phpunit