diff --git a/intercom.gemspec b/intercom.gemspec
index a6878d5..e5ed773 100644
--- a/intercom.gemspec
+++ b/intercom.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.4'
   spec.add_development_dependency "m", "~> 1.5.0"
   spec.add_development_dependency 'rake', '~> 10.3'
-  spec.add_development_dependency 'mocha', '~> 1.0'
+  spec.add_development_dependency 'mocha', '~> 2.0'
   spec.add_development_dependency "fakeweb", ["~> 1.3"]
   spec.add_development_dependency "pry"
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d94db57..1dc07c6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,7 @@
 
 require 'intercom'
 require 'minitest/autorun'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'webmock'
 require 'time'
 require 'pry'