diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4ee786..faab909 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ before_script:
   - mkdir -p tmp/pids log
   - bundle check || bundle install
   - script/noosfero-plugins disableall
-  - rm -f tmp/makemo.stamp && rake makemo &>/dev/null
+  - bundle exec rake makemo &>/dev/null
 # database
   - cp config/database.yml.gitlab-ci config/database.yml
   - createdb gitlab_ci_test || true
diff --git a/.travis.yml b/.travis.yml
index 262ea38..30a9d21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,26 @@ language: ruby
 rvm:
 # for 2.2 support we need to upgrade the pg gem
   - 2.1.6
+cache: bundler
+
+sudo: false
+addons:
+  apt:
+    packages:
+      - po4a
+      - iso-codes
+      - tango-icon-theme
+      - pidgin-data
+      # for gem extensions
+      - libmagickwand-dev
+      - libpq-dev
+      - libreadline-dev
+      - libsqlite3-dev
+      - libxslt1-dev
 
 before_install:
-# dependencies
-  - sudo apt-get update
-  - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data default-jre
-  - sudo apt-get -y install libmagickwand-dev libpq-dev libreadline-dev libsqlite3-dev libxslt1-dev
+# FIXME: workaround while https://github.com/travis-ci/travis-ci/issues/4210 is open
+  - rm config/initializers/default_icon_theme.rb
 # selenium support
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
@@ -16,12 +30,12 @@ before_script:
   - mkdir -p tmp/pids log
   - bundle check || bundle install
   - script/noosfero-plugins disableall
-  - rake makemo
+  - bundle exec rake makemo &>/dev/null
 # database
   - cp config/database.yml.travis config/database.yml
   - psql -c 'create database myapp_test;' -U postgres
-  - bundle exec rake db:schema:load
-  - bundle exec rake db:migrate
+  - bundle exec rake db:schema:load &>/dev/null
+  - bundle exec rake db:migrate &>/dev/null
 
 env:
   - TASK=test:units
diff --git a/Gemfile b/Gemfile
index 2fb6f56..9df5fe6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'exception_notification',   '~> 4.0.1'
 gem 'gettext',                  '~> 2.2.1', :require => false
 gem 'locale',                   '~> 2.0.5'
 gem 'whenever', :require => false
-gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
+gem 'eita-jrails', '~> 0.9.5', require: 'jrails'
 
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
--
libgit2 0.21.2