1 files changed, 1 insertions, 8 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 782cffc1d1..e22cf00137 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -36,6 +36,7 @@ else
 end
 
 Dir["#{File.expand_path("../support", __FILE__)}/*.rb"].each do |file|
+  file = file.gsub(%r{\A#{Regexp.escape File.expand_path("..", __FILE__)}/}, "")
   require file unless file.end_with?("hax.rb")
 end
 
@@ -104,14 +105,6 @@ RSpec.configure do |config|
 
   config.before :all do
     build_repo1
-    # HACK: necessary until rspec-mocks > 3.5.0 is used
-    # see https://github.com/bundler/bundler/pull/5363#issuecomment-278089256
-    if RUBY_VERSION < "1.9"
-      FileUtils.module_eval do
-        alias_method :mkpath, :mkdir_p
-        module_function :mkpath
-      end
-    end
   end
 
   config.before :each do