diff --git a/.travis.yml b/.travis.yml
index a810bf759..bd19bb951 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,13 @@
 language: ruby
 
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq -y bsdtar
-  - rvm @global do gem uninstall bundler --all --executables
-  - gem uninstall bundler --all --executables
-  - gem install bundler --version '< 1.7.0'
+sudo: false
+
+cache: bundler
+
+addons:
+  apt:
+    packages:
+    - bsdtar
 
 rvm:
   - 2.0.0
@@ -18,4 +20,4 @@ env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
-script: rake test:unit
+script: bundle exec rake test:unit
diff --git a/tasks/test.rake b/tasks/test.rake
index 18e4395b1..a6da5e8c9 100644
--- a/tasks/test.rake
+++ b/tasks/test.rake
@@ -4,11 +4,6 @@ require 'rspec/core/rake_task'
 namespace :test do
   RSpec::Core::RakeTask.new(:unit) do |t|
     t.pattern = "test/unit/**/*_test.rb"
-  end
-
-  Rake::TestTask.new do |t|
-    t.name = "unit_old"
-    t.libs << "test/unit_legacy"
-    t.pattern = "test/unit_legacy/**/*_test.rb"
+    t.rspec_opts = "--color"
   end
 end