diff --git a/Gemfile b/Gemfile
index 502e8676a..68b1b433c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,7 +96,7 @@ end
 group :test do
   gem "minitest"
   gem "rails-dom-testing"
-  gem "mocha"
+  gem 'mocha', '>= 1.4.0'
   gem "simplecov", "~> 0.9.1", :require => false
   # TODO: remove this after upgrading to Rails 5
   gem "test_after_commit", "~> 0.4.2"
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0066d3819..270acb5ea 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -33,7 +33,7 @@ require File.expand_path(File.dirname(__FILE__) + '/object_helpers')
 include ObjectHelpers
 
 require 'net/ldap'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'fileutils'
 
 Redmine::SudoMode.disable!