diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 4e5a9c3715a758b46f98fd5886ddd20411e35f56..93aae2807e9ed1662fa870c8ee56196941fa4a51 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -26,27 +26,9 @@
 FIXTURE_LOAD_PATH = File.expand_path('fixtures', File.dirname(__FILE__))
 ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
 
-class MockSMTP
-  def self.deliveries
-    @@deliveries
-  end
-
-  def initialize
-    @@deliveries = []
-  end
-
-  def sendmail(mail, from, to)
-    @@deliveries << [mail, from, to]
-  end
-
-  def start(*args)
-    yield self
-  end
-end
-
-class Net::SMTP
-  def self.new(*args)
-    MockSMTP.new
+class Rails
+  def self.root
+    File.expand_path('../', File.dirname(__FILE__))
   end
 end
 
diff --git a/actionmailer/test/asset_host_test.rb b/actionmailer/test/asset_host_test.rb
index 00f1348a533acef3f072ee0bf280cc3ad2227a68..9ba67c28420de5460f8e1004b3cfd158c1fdaf12 100644
--- a/actionmailer/test/asset_host_test.rb
+++ b/actionmailer/test/asset_host_test.rb
@@ -31,25 +31,10 @@ def test_asset_host_as_string
   def test_asset_host_as_one_argument_proc
     AssetHostMailer.config.asset_host = Proc.new { |source|
       if source.starts_with?('/images')
-        "http://images.example.com"
-      else
-        "http://assets.example.com"
+        'http://images.example.com'
       end
     }
     mail = AssetHostMailer.email_with_asset
     assert_equal %Q{<img alt="Somelogo" src="http://images.example.com/images/somelogo.png" />}, mail.body.to_s.strip
   end
-
-  def test_asset_host_as_two_argument_proc
-    ActionController::Base.config.asset_host = Proc.new {|source,request|
-      if request && request.ssl?
-        "https://www.example.com"
-      else
-        "http://www.example.com"
-      end
-    }
-    mail = nil
-    assert_nothing_raised { mail = AssetHostMailer.email_with_asset }
-    assert_equal %Q{<img alt="Somelogo" src="http://www.example.com/images/somelogo.png" />}, mail.body.to_s.strip
-  end
 end
diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb
index 16e8638542a7d21e674f9ef000751a17fbefa279..a76ac6d295f7fa84bbd0a32fbb549b626c2b1290 100644
--- a/actionmailer/test/delivery_methods_test.rb
+++ b/actionmailer/test/delivery_methods_test.rb
@@ -108,6 +108,7 @@ def welcome(hash={})
   end
 
   test "delivery method can be customized per instance" do
+    Mail::SMTP.any_instance.expects(:deliver!)
     email = DeliveryMailer.welcome.deliver
     assert_instance_of Mail::SMTP, email.delivery_method
     email = DeliveryMailer.welcome(delivery_method: :test).deliver
@@ -117,7 +118,6 @@ def welcome(hash={})
   test "delivery method can be customized in subclasses not changing the parent" do
     DeliveryMailer.delivery_method = :test
     assert_equal :smtp, ActionMailer::Base.delivery_method
-    $BREAK = true
     email = DeliveryMailer.welcome.deliver
     assert_instance_of Mail::TestMailer, email.delivery_method
   end
diff --git a/actionmailer/test/fixtures/test_helper_mailer/welcome b/actionmailer/test/fixtures/test_helper_mailer/welcome
new file mode 100644
index 0000000000000000000000000000000000000000..61ce70d578709a39ce3e72839974c6764bef52b3
--- /dev/null
+++ b/actionmailer/test/fixtures/test_helper_mailer/welcome
@@ -0,0 +1 @@
+Welcome!
\ No newline at end of file
diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb
index d9d588a95081a4873c2e58b588bb548514446356..2863d60a168abb92fc70c55999044b243ef37967 100644
--- a/actionmailer/test/i18n_with_controller_test.rb
+++ b/actionmailer/test/i18n_with_controller_test.rb
@@ -37,6 +37,7 @@ def app
   end
 
   def test_send_mail
+    Mail::SMTP.any_instance.expects(:deliver!)
     with_translation 'de', email_subject: '[Anmeldung] Willkommen' do
       get '/test/send_mail'
       assert_equal "Mail sent - Subject: [Anmeldung] Willkommen", @response.body
diff --git a/actionmailer/test/test_helper_test.rb b/actionmailer/test/test_helper_test.rb
index 7c7f0b6fdcb8b372f9b3dbf3342571103cc36027..1ff08a3b6ebcc0a383d270645bb02bf359426da6 100644
--- a/actionmailer/test/test_helper_test.rb
+++ b/actionmailer/test/test_helper_test.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'abstract_unit'
 
 class TestHelperMailer < ActionMailer::Base
@@ -36,6 +37,14 @@ def test_charset_is_utf_8
     assert_equal "UTF-8", charset
   end
 
+  def test_encode
+    assert_equal '=?UTF-8?Q?This_is_=E3=81=82_string?=', encode('This is あ string')
+  end
+
+  def test_read_fixture
+    assert_equal ['Welcome!'], read_fixture('welcome')
+  end
+
   def test_assert_emails
     assert_nothing_raised do
       assert_emails 1 do