diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec
index 81204bd..ab8312b 100644
--- a/bitbucket_rest_api.gemspec
+++ b/bitbucket_rest_api.gemspec
@@ -30,5 +30,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'pry-byebug'
-  gem.add_development_dependency 'mocha'
 end
diff --git a/spec/bitbucket_rest_api/request_spec.rb b/spec/bitbucket_rest_api/request_spec.rb
index a84c2c2..10b4085 100644
--- a/spec/bitbucket_rest_api/request_spec.rb
+++ b/spec/bitbucket_rest_api/request_spec.rb
@@ -2,8 +2,19 @@
 require 'bitbucket_rest_api/request'
 
 describe BitBucket::Request do
-  let(:fake_api) { (Class.new { include BitBucket::Request })}
-  let(:faraday_connection) { Faraday.new(:url => 'https://api.bitbucket.org') }
+  let(:fake_api) do
+    Class.new do
+      include BitBucket::Request
+
+      def connection(*args)
+        Faraday.new(:url => 'https://api.bitbucket.org')
+      end
+
+      def new_access_token
+        "12345"
+      end
+    end
+  end
 
   describe "request" do
     it "raises an ArgumentError if an unsupported HTTP verb is used" do
@@ -11,18 +22,13 @@
     end
 
     context "with a connection" do
-      before do
-        (fake_api).any_instance.stubs(:connection).returns(faraday_connection)
-        (fake_api).any_instance.stubs(:new_access_token).returns("12345")
-      end
-
       it "supports get" do
         stub_request(:get, "https://api.bitbucket.org/1.0/endpoint").
          with(:headers => {
           'Accept' => '*/*',
           'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
           'Authorization' => 'Bearer 12345',
-          'User-Agent' => 'Faraday v0.9.2'
+          'User-Agent' => "Faraday v#{Faraday::VERSION}"
           })
 
         fake_api.new.request(:get, '/1.0/endpoint', {}, {})
@@ -35,7 +41,7 @@
             'Accept' => '*/*',
             'Content-Type'=>'application/x-www-form-urlencoded',
             'Authorization' => 'Bearer 12345',
-            'User-Agent' => 'Faraday v0.9.2'
+            'User-Agent' => "Faraday v#{Faraday::VERSION}"
           })
 
         fake_api.new.request(:put, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {})
@@ -48,7 +54,7 @@
             'Accept' => '*/*',
             'Content-Type'=>'application/x-www-form-urlencoded',
             'Authorization' => 'Bearer 12345',
-            'User-Agent' => 'Faraday v0.9.2'
+            'User-Agent' => "Faraday v#{Faraday::VERSION}"
           })
 
         fake_api.new.request(:patch, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {})
@@ -59,7 +65,7 @@
          with(:headers => {
           'Accept' => '*/*',
           'Authorization' => 'Bearer 12345',
-          'User-Agent' => 'Faraday v0.9.2'
+          'User-Agent' => "Faraday v#{Faraday::VERSION}"
           })
         fake_api.new.request(:delete, '/1.0/endpoint', {}, {})
       end
@@ -71,7 +77,7 @@
             'Accept' => '*/*',
             'Content-Type'=>'application/x-www-form-urlencoded',
             'Authorization' => 'Bearer 12345',
-            'User-Agent' => 'Faraday v0.9.2'
+            'User-Agent' => "Faraday v#{Faraday::VERSION}"
           })
 
         fake_api.new.request(:post, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {})
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 27cfe60..18a9777 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,7 +10,6 @@
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-    config.mock_with :mocha
   end
 
   config.mock_with :rspec do |mocks|