diff --git a/.travis.yml b/.travis.yml
index 6e6f092d4e..1a54562866 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,9 @@ rvm:
   - "2.3"
   - "2.4"
   - "2.5"
-
 cache:
   bundler: true
 bundler_args: --without development
-before_install:
-  - gem install bundler
-  - gem update --system
 script:
   - bundle exec rake
   - bundle exec rubocop
diff --git a/Gemfile b/Gemfile
index 700b0cea01..d6fda5d522 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,12 +4,12 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'bundler', '~> 1.15'
 gem 'rake'
 
 gem 'minitest', '>= 5.0'
 gem 'minitest-power_assert'
 
+gem 'parallel', '~> 1.13.0' if RUBY_VERSION < '2.2.0'
 gem 'rubocop', '~> 0.49.1'
 
 # don't try to install redcarpet under jruby
@@ -23,6 +23,10 @@ group :development do
   gem 'github-markup'
 
   # for visual tests
-  gem 'sinatra'
+  if RUBY_VERSION < '2.2.0'
+    gem 'sinatra', '~> 1.4.8'
+  else
+    gem 'sinatra'
+  end
   gem 'shotgun'
 end