diff --git a/plugins/stoa/test/functional/account_controller_test.rb b/plugins/stoa/test/functional/account_controller_test.rb
index 8807dcd..9f85204 100644
--- a/plugins/stoa/test/functional/account_controller_test.rb
+++ b/plugins/stoa/test/functional/account_controller_test.rb
@@ -38,10 +38,10 @@ class AccountControllerTest < ActionController::TestCase
   should 'pass if confirmation value matches' do
     #StoaPlugin::UspUser.stubs(:matches?).returns(true)
     post :signup, :profile_data => {:usp_id => '12345678'}, :confirmation_field => 'cpf', :cpf => '12345678'
-    assert_nil assigns(:person).errors[:usp_id]
+    assert !assigns(:person).errors.include?(:usp_id)
   end
 
-  should 'inlude invitation_code param in the person\'s attributes' do
+  should 'include invitation_code param in the person\'s attributes' do
     get :signup, :invitation_code => 12345678
     assert assigns(:person).invitation_code == '12345678'
   end
diff --git a/plugins/stoa/test/functional/profile_editor_controller_test.rb b/plugins/stoa/test/functional/profile_editor_controller_test.rb
index 986e049..822b0e5 100644
--- a/plugins/stoa/test/functional/profile_editor_controller_test.rb
+++ b/plugins/stoa/test/functional/profile_editor_controller_test.rb
@@ -45,7 +45,7 @@ class StoaPluginProfileEditorControllerTest < ActionController::TestCase
   should 'display error if usp_id does not match with supplied confirmation' do
     StoaPlugin::UspUser.stubs(:matches?).returns(false)
     post :edit, :profile => person.identifier, :profile_data => {:usp_id => 12345678}, :confirmation_field => 'cpf', :cpf => 99999999
-    assert assigns(:profile_data).errors.invalid?(:usp_id)
+    assert assigns(:profile_data).errors.include?(:usp_id)
   end
 
   should 'save usp_id if everyhtings is ok' do
diff --git a/plugins/stoa/test/unit/person_test.rb b/plugins/stoa/test/unit/person_test.rb
index 79be335..348d5d2 100644
--- a/plugins/stoa/test/unit/person_test.rb
+++ b/plugins/stoa/test/unit/person_test.rb
@@ -15,7 +15,7 @@ class StoaPlugin::Person < ActiveSupport::TestCase
     another_person = Person.new(:usp_id => usp_id)
     another_person.valid?
 
-    assert another_person.errors.invalid?(:usp_id)
+    assert another_person.errors.include?(:usp_id)
   end
 
   should 'not allow usp_id as an empty string' do
@@ -28,17 +28,17 @@ class StoaPlugin::Person < ActiveSupport::TestCase
   should 'allow nil usp_id only if person has an invitation_code or is a template' do
     person = Person.new(:environment => environment)
     person.valid?
-    assert person.errors.invalid?(:usp_id)
+    assert person.errors.include?(:usp_id)
 
     Task.create!(:code => 12345678)
     person.invitation_code = 12345678
     person.valid?
-    assert !person.errors.invalid?(:usp_id)
+    assert !person.errors.include?(:usp_id)
 
     person.invitation_code = nil
     person.is_template = true
     person.valid?
-    assert !person.errors.invalid?(:usp_id)
+    assert !person.errors.include?(:usp_id)
   end
 
   should 'allow multiple nil usp_id' do
@@ -47,7 +47,7 @@ class StoaPlugin::Person < ActiveSupport::TestCase
     person = Person.new(:invitation_code => 87654321)
     person.valid?
 
-    assert !person.errors.invalid?(:usp_id)
+    assert !person.errors.include?(:usp_id)
   end
 
   should 'not allow person to be saved with a finished invitation that is not his own' do
@@ -56,7 +56,7 @@ class StoaPlugin::Person < ActiveSupport::TestCase
     person = Person.new(:environment => environment, :invitation_code => 87654321)
     person.valid?
 
-    assert person.errors.invalid?(:usp_id)
+    assert person.errors.include?(:usp_id)
   end
 
   should 'allow person to be saved with a finished invitation if it is his own' do
@@ -68,7 +68,7 @@ class StoaPlugin::Person < ActiveSupport::TestCase
     t.finish
 
     person.valid?
-    assert !person.errors.invalid?(:usp_id)
+    assert !person.errors.include?(:usp_id)
   end
 
 
--
libgit2 0.21.2