1 files changed, 3 insertions, 4 deletions
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 45c238d302..8f4de8fafa 100644
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -1,5 +1,4 @@
 require 'rake/testtask'
-require 'rake/packagetask'
 require 'rubygems/package_task'
 
 desc "Default Task"
@@ -11,13 +10,13 @@ Rake::TestTask.new { |t|
   t.pattern = 'test/**/*_test.rb'
   t.warning = true
   t.verbose = true
+  t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
 }
 
 namespace :test do
   task :isolated do
-    ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
     Dir.glob("test/**/*_test.rb").all? do |file|
-      sh(ruby, '-Ilib:test', file)
+      sh(Gem.ruby, '-w', '-Ilib:test', file)
     end or raise "Failures"
   end
 end
@@ -28,7 +27,7 @@ Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
-desc "Release to gemcutter"
+desc "Release to rubygems"
 task release: :package do
   require 'rake/gemcutter'
   Rake::Gemcutter::Tasks.new(spec).define