1 files changed, 9 insertions, 4 deletions
diff --git a/railties/Rakefile b/railties/Rakefile
index 827b2ba0cd..25e515e016 100755
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
 require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 require 'date'
 require 'rbconfig'
@@ -17,8 +17,13 @@ namespace :test do
     dir = ENV["TEST_DIR"] || "**"
     Dir["test/#{dir}/*_test.rb"].each do |file|
       next true if file.include?("fixtures")
-      ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
-      sh(ruby, '-Itest', "-I#{File.dirname(__FILE__)}/../activesupport/lib", file)
+      dash_i = [
+        'test',
+        'lib',
+        "#{File.dirname(__FILE__)}/../activesupport/lib",
+        "#{File.dirname(__FILE__)}/../actionpack/lib"
+      ]
+      ruby "-I#{dash_i.join ':'}", file
     end
   end
 end
@@ -55,7 +60,7 @@ end
 
 spec = eval(File.read('railties.gemspec'))
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end