diff --git a/test/test_helper.rb b/test/test_helper.rb
index 378c9b11..ad5a6db6 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -12,7 +12,7 @@ require "orm/#{DEVISE_ORM}"
 
 I18n.load_path << File.expand_path("../support/locale/en.yml", __FILE__)
 
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'timecop'
 require 'webrat'
 Webrat.configure do |config|