diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index 56b3f47..371652d 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -794,7 +794,7 @@ class EnvironmentTest < ActiveSupport::TestCase
     e2 = fast_create(Environment)
     role2 = Role.new(:name => 'test_role', :environment => e2)
 
-    assert_valid role2
+    assert role2.valid?
   end
 
   should 'have roles with keys independent of other environments' do
@@ -803,7 +803,7 @@ class EnvironmentTest < ActiveSupport::TestCase
     e2 = fast_create(Environment)
     role2 = Role.new(:name => 'test_role', :environment => e2, :key => 'a_member')
 
-    assert_valid role2
+    assert role2.valid?
   end
 
   should 'have a help_message_to_add_enterprise attribute' do
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index 08e6b0e..69ae62d 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -587,8 +587,9 @@ class PersonTest < ActiveSupport::TestCase
     end
   end
 
-  should 'not rename' do
-    assert_valid p = create_user('test_user').person
+  should 'not be renamed' do
+    p = create_user('test_user').person
+    assert p.valid?
     assert_raise ArgumentError do
       p.identifier = 'other_person_name'
     end
--
libgit2 0.21.2