diff --git a/.travis.yml b/.travis.yml
index 9f5164b..7eb802e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 notifications:
   disabled: true
-before_install:
-  - gem install bundler
 bundler_args: --without extra
 rvm:
   - ree
diff --git a/Gemfile b/Gemfile
index a5c0441..cd20a60 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,6 @@ group :extra do
   gem "debugger", :platform => [:ruby_19, :ruby_20]
 end
 
-gem "minitest", :platform => :ruby_18
 gem "rake"
 
 # xml parsers
diff --git a/Rakefile b/Rakefile
index 648e494..92c1dfc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,5 @@
-require "bundler"
-Bundler::GemHelper.install_tasks
-Bundler.setup
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
 require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
diff --git a/alexa.gemspec b/alexa.gemspec
index 0cb9565..6e59868 100644
--- a/alexa.gemspec
+++ b/alexa.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "multi_xml", ">= 0.5.0"
   gem.add_dependency "faraday", "~> 0.8.7"
 
+  gem.add_development_dependency "minitest", ">= 5.0.0"
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "webmock"
 end
diff --git a/test/helper.rb b/test/helper.rb
index f55ba59..41c7246 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,6 +1,6 @@
 require "minitest/autorun"
 require "webmock/minitest"
-require "mocha"
+require "mocha/setup"
 
 require "alexa"
 
@@ -9,7 +9,7 @@
 require xml_parser if ["nokogiri", "libxml", "ox"].include?(xml_parser)
 MultiXml.parser = xml_parser
 
-class MiniTest::Unit::TestCase
+class MiniTest::Test
   def setup
     WebMock.disable_net_connect!
   end