diff --git a/friendly_id.gemspec b/friendly_id.gemspec
index e261b6b9..05d99e75 100644
--- a/friendly_id.gemspec
+++ b/friendly_id.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coveralls"
   s.add_development_dependency "railties", ">= 4.0"
   s.add_development_dependency "minitest", "~> 5.3"
-  s.add_development_dependency "mocha", "~> 1.1"
+  s.add_development_dependency "mocha", "~> 2.1"
   s.add_development_dependency "yard"
   s.add_development_dependency "i18n"
   s.add_development_dependency "ffaker"
diff --git a/test/helper.rb b/test/helper.rb
index 0f7a40b6..5ee359c1 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -19,9 +19,9 @@
 end
 
 begin
-  TestCaseClass = MiniTest::Test
+  TestCaseClass = Minitest::Test
 rescue NameError
-  TestCaseClass = MiniTest::Unit::TestCase
+  TestCaseClass = Minitest::Unit::TestCase
 end
 
 require "mocha/minitest"