diff --git a/.travis.yml b/.travis.yml
index 687007b9..8576a875 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,10 @@ rvm:
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+# We need to install latest version of bundler, because one in travis
+# image is too old to recognize platform => :mri_22 in Gemfile. 
+before_install:
+  - gem install bundler
 before_script:
   - mysql -e 'create database umlaut3_test;'
   - mysql -e 'create database sfxlcl41_test;'
diff --git a/Gemfile b/Gemfile
index ede2e26e..019caf69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,6 +33,7 @@ end
 
 group :debug do
   gem 'debugger', :platform => :mri_19
+  gem 'byebug',   :platform => [:mri_21, :mri_22]
   gem 'ruby-debug', :platform => :jruby
 end