diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index <HASH>..<HASH> 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -57,13 +57,15 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_should_reset_password
-    @user.update_attributes(:password => 'new password', :password_confirmation => 'new password')
-    assert_equal @user, User.authenticate(@user.login, @user.password)
+    user = User.make(:login => "foo", :password => "barbarbar")
+    user.update_attributes(:password => 'new password', :password_confirmation => 'new password')
+    assert_equal user, User.authenticate(user.login, user.password)
   end
 
   def test_should_not_rehash_password
-    @user.update_attributes(:login => 'quentin2')
-    assert_equal @user, User.authenticate('quentin2', @user.password)
+    user = User.make(:login => "foo", :password => "barbarbar")
+    user.update_attributes(:login => 'quentin2')
+    assert_equal user, User.authenticate('quentin2', user.password)
   end
 
   def test_should_authenticate_user
fix two more tests like that
(cherry picked from commit <I>f<I>f6d<I>f1abc<I>bed<I>a2a5f7b<I>)