diff --git a/.travis.yml b/.travis.yml
index 03a1e2326..a84d17061 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ sudo: false
 language: ruby
 cache: bundler
 script: "bundle exec rake validate lint spec"
+before_install:
+  - gem update bundler
 matrix:
   fast_finish: true
   include:
diff --git a/Gemfile b/Gemfile
index c97275bd8..8222ef0a7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,8 @@ group :development, :unit_tests do
   gem 'rspec-puppet', '>= 2.3.2'
   gem 'rspec-puppet-facts'
   gem 'simplecov'
-  gem 'parallel_tests'
+  gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
+  gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
   gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
   gem 'rubocop' if RUBY_VERSION >= '2.0.0'
   gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'