diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index 0592658..d8dfa45 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -1342,12 +1342,12 @@ class PersonTest < ActiveSupport::TestCase
     (1..5).each {|i|
       u = create_user('user'+i.to_s)
       e.add_admin(u.person)
-      admins << u.person    
+      admins << u.person
     }
     (6..10).each {|i|
       u = create_user('user'+i.to_s)
     }
-    assert_equal admins, Person.admins 
+    assert_equal admins, Person.admins
   end
 
   should 'activated named_scope return persons who are activated users' do
@@ -1356,17 +1356,14 @@ class PersonTest < ActiveSupport::TestCase
     activated = []
     (1..5).each {|i|
       u = create_user('user'+i.to_s)
-      u.activated_at = Time.now.utc
-      u.activation_code = nil
-      u.save!
-      activated << u.person    
+      u.activate
+      activated << u.person
     }
     (6..10).each {|i|
       u = create_user('user'+i.to_s)
-      u.activated_at = nil
-      u.save!
+      u.deactivate
     }
-    assert_equal activated, Person.activated 
+    assert_equal activated, Person.activated
   end
 
   should 'deactivated named_scope return persons who are deactivated users' do
@@ -1375,16 +1372,13 @@ class PersonTest < ActiveSupport::TestCase
     deactivated = []
     (1..5).each {|i|
       u = create_user('user'+i.to_s)
-      u.activated_at = nil
-      u.save!
-      deactivated << u.person    
+      u.deactivate
+      deactivated << u.person
     }
     (6..10).each {|i|
       u = create_user('user'+i.to_s)
-      u.activated_at = Time.now.utc
-      u.activation_code = nil
-      u.save!
+      u.activate
     }
-    assert_equal deactivated, Person.deactivated 
+    assert_equal deactivated, Person.deactivated
   end
 end
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 6b49ffe..6b74bb0 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -520,8 +520,7 @@ class UserTest < ActiveSupport::TestCase
 
   should 'deactivate an user' do
     user = new_user
-    user.activated_at = Time.now.utc
-    user.person.visible = true
+    user.activate
     assert user.deactivate
     assert_nil user.activated_at
     assert !user.person.visible
@@ -529,14 +528,12 @@ class UserTest < ActiveSupport::TestCase
 
   should 'return if the user is deactivated' do
     user = new_user
-    user.activated_at = Time.now.utc
-    user.activation_code = nil
-    user.person.visible = true
+    user.activate
     assert user.activated?
     user.deactivate
     assert !user.activated?
   end
-  
+
   should 'activate right after creation when confirmation is not required' do
     e = Environment.default
     e.enable('skip_new_user_email_confirmation')
--
libgit2 0.21.2