diff --git a/bundler.gemspec b/bundler.gemspec
index eebc4ef53bb..56cb8e3ae17 100644
--- a/bundler.gemspec
+++ b/bundler.gemspec
@@ -5,7 +5,7 @@ begin
   require File.expand_path("../lib/bundler/version", __FILE__)
 rescue LoadError
   # for Ruby core repository
-  require File.expand_path("../bundler/version", __FILE__)
+  require File.expand_path("../version", __FILE__)
 end
 
 Gem::Specification.new do |s|
diff --git a/spec/support/path.rb b/spec/support/path.rb
index f85fbf330f2..ae7a8c5bbea 100644
--- a/spec/support/path.rb
+++ b/spec/support/path.rb
@@ -9,7 +9,7 @@ def root
     end
 
     def gemspec
-      @gemspec ||= root.join(ruby_core? ? "lib/bundler.gemspec" : "bundler.gemspec")
+      @gemspec ||= root.join(ruby_core? ? "lib/bundler/bundler.gemspec" : "bundler.gemspec")
     end
 
     def bindir