diff --git a/test/unit/environment_mailing_test.rb b/test/unit/environment_mailing_test.rb
index 488f7bc..2c38d77 100644
--- a/test/unit/environment_mailing_test.rb
+++ b/test/unit/environment_mailing_test.rb
@@ -16,70 +16,74 @@ class EnvironmentMailingTest < ActiveSupport::TestCase
   should 'require source_id' do
     mailing = EnvironmentMailing.new
     mailing.valid?
-    assert mailing.errors.invalid?(:source_id)
+    assert mailing.errors[:source_id].any?
 
     mailing.source_id = environment.id
     mailing.valid?
-    assert !mailing.errors.invalid?(:source_id)
+    assert !mailing.errors[:source_id].any?
   end
 
   should 'return environment name' do
-    mailing = EnvironmentMailing.new(:source => environment)
+    mailing = new_mailing(environment)
     assert_equal environment.name, mailing.source.name
   end
 
   should 'return environment with source_id' do
-    mailing = EnvironmentMailing.new(:source => environment)
+    mailing = new_mailing(environment)
     assert_equal environment, mailing.source
   end
 
   should 'return signature message' do
-    mailing = EnvironmentMailing.new(:source => environment)
+    mailing = new_mailing(environment)
     assert_equal 'Sent by Network.', mailing.signature_message
   end
 
   should 'return url for environment on url' do
-    mailing = EnvironmentMailing.new(:source => environment)
-    environment.domains << Domain.create(:name => 'noosfero.net', :is_default => true)
+    mailing = new_mailing(environment)
+    domain = Domain.new(:name => 'noosfero.net')
+    domain.is_default = true
+    environment.domains << domain
     assert_equal 'http://noosfero.net', mailing.url
   end
 
   should 'display name and email on generate_from' do
-    mailing = EnvironmentMailing.new(:source => environment, :person => person_1)
+    mailing = new_mailing(environment).tap do |m|
+      m.person = person_1
+    end
     assert_equal "#{environment.name} <#{environment.contact_email}>", mailing.generate_from
   end
 
   should 'deliver mailing to each recipient after create' do
-    mailing = EnvironmentMailing.create(:source => environment, :subject => 'Hello', :body => 'We have some news', :person => person_1)
+    mailing = create_mailing(environment, :person => person_1)
     process_delayed_job_queue
     assert_equal 2, ActionMailer::Base.deliveries.count
   end
 
   should 'create mailing sent to each recipient after delivering mailing' do
-    mailing = EnvironmentMailing.create(:source => environment, :subject => 'Hello', :body => 'We have some news', :person => person_1)
+    mailing = create_mailing(environment, :person => person_1)
     assert_difference MailingSent, :count, 2 do
       process_delayed_job_queue
     end
   end
 
   should 'change locale according to the mailing locale' do
-    mailing = EnvironmentMailing.create(:source => environment, :subject => 'Hello', :body => 'We have some news', :locale => 'pt', :person => person_1)
+    mailing = create_mailing(environment, :locale => 'pt', :person => person_1)
     Noosfero.expects(:with_locale).with('pt')
     process_delayed_job_queue
   end
 
   should 'return recipients' do
-    mailing = EnvironmentMailing.create(:source => environment, :subject => 'Hello', :body => 'We have some news', :locale => 'pt', :person => person_1)
+    mailing = create_mailing(environment, :locale => 'pt', :person => person_1)
     assert_equal [person_1, person_2], mailing.recipients
   end
 
   should 'return recipients according to limit' do
-    mailing = EnvironmentMailing.create(:source => environment, :subject => 'Hello', :body => 'We have some news', :locale => 'pt', :person => person_1)
+    mailing = create_mailing(environment, :locale => 'pt', :person => person_1)
     assert_equal [person_1], mailing.recipients(0, 1)
   end
 
   should 'return true if already sent mailing to a recipient' do
-    mailing = EnvironmentMailing.create(:source => environment, :subject => 'Hello', :body => 'We have some news', :person => person_1)
+    mailing = create_mailing(environment, :person => person_1)
     process_delayed_job_queue
 
     assert mailing.mailing_sents.find_by_person_id(person_1.id)
@@ -88,10 +92,24 @@ class EnvironmentMailingTest < ActiveSupport::TestCase
   should 'return false if did not sent mailing to a recipient' do
     recipient = fast_create(Person)
     person = Person['user_one']
-    mailing = EnvironmentMailing.create(:source => environment, :subject => 'Hello', :body => 'We have some news', :person => person_1)
+    mailing = create_mailing(environment, :person => person_1)
     process_delayed_job_queue
 
     assert !mailing.mailing_sents.find_by_person_id(recipient.id)
   end
 
+  def new_mailing(environment)
+    m = EnvironmentMailing.new(:subject => 'Hello', :body => 'We have some news')
+    m.source = environment
+    m
+  end
+
+  def create_mailing(environment, options)
+    new_mailing(environment).tap do |m|
+      m.locale = options[:locale]
+      m.person = options[:person]
+      m.save!
+    end
+  end
+
 end
--
libgit2 0.21.2