diff --git a/bourne.gemspec b/bourne.gemspec
index f30e851..09ec6ca 100644
--- a/bourne.gemspec
+++ b/bourne.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Follow instructions in test/unit/mock_test.rb to update.
-  s.add_dependency('mocha', '>= 0.13.2', '< 0.15')
+  s.add_dependency('mocha', '>= 1.0', '< 2.0')
 
   s.add_development_dependency('rake')
 end
diff --git a/test/unit/assert_received_test.rb b/test/unit/assert_received_test.rb
index a95f26f..8670865 100644
--- a/test/unit/assert_received_test.rb
+++ b/test/unit/assert_received_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require_relative "../test_helper"
 require 'test_runner'
 require 'bourne/api'
 require 'bourne/mockery'
diff --git a/test/unit/have_received_test.rb b/test/unit/have_received_test.rb
index de5e4be..dacf7e8 100644
--- a/test/unit/have_received_test.rb
+++ b/test/unit/have_received_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require_relative "../test_helper"
 require 'test_runner'
 require 'bourne/api'
 require 'bourne/mockery'
diff --git a/test/unit/invocation_test.rb b/test/unit/invocation_test.rb
index f97f443..9168176 100644
--- a/test/unit/invocation_test.rb
+++ b/test/unit/invocation_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require_relative "../test_helper"
 require 'bourne/invocation'
 
 class InvocationTest < Test::Unit::TestCase
diff --git a/test/unit/mock_test.rb b/test/unit/mock_test.rb
index e384c34..0797824 100644
--- a/test/unit/mock_test.rb
+++ b/test/unit/mock_test.rb
@@ -1,9 +1,10 @@
 # to update:
 # - copy new code from https://raw.github.com/freerange/mocha/master/test/unit/mock_test.rb
-# - keep: require 'bourne/mock'
+# - keep: require 'bourne/mockery'
 # - keep: FakeExpectation test
 require File.expand_path('../../test_helper', __FILE__)
-require 'bourne/mock'
+require 'bourne/mockery'
+require 'mocha/mock'
 require 'mocha/expectation_error_factory'
 require 'set'
 require 'simple_counter'
diff --git a/test/unit/mockery_test.rb b/test/unit/mockery_test.rb
index 1e52e21..3af55ee 100644
--- a/test/unit/mockery_test.rb
+++ b/test/unit/mockery_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 require 'bourne/mockery'
 require 'mocha/state_machine'
 require 'bourne/invocation'