diff --git a/test/models/database_authenticatable_test.rb b/test/models/database_authenticatable_test.rb
index 676b44d2bb..c6fa527f8e 100644
--- a/test/models/database_authenticatable_test.rb
+++ b/test/models/database_authenticatable_test.rb
@@ -97,8 +97,8 @@ def setup
 
   test 'should respond to password and password confirmation' do
     user = new_user
-    assert user.respond_to?(:password)
-    assert user.respond_to?(:password_confirmation)
+    assert_respond_to user, :password
+    assert_respond_to user, :password_confirmation
   end
 
   test 'should generate a hashed password while setting password' do
@@ -149,7 +149,7 @@ def setup
   end
 
   test 'should respond to current password' do
-    assert new_user.respond_to?(:current_password)
+    assert_respond_to new_user, :current_password
   end
 
   test 'should update password with valid current password' do
diff --git a/test/models/rememberable_test.rb b/test/models/rememberable_test.rb
index 076a18a248..8b83172120 100644
--- a/test/models/rememberable_test.rb
+++ b/test/models/rememberable_test.rb
@@ -129,8 +129,8 @@ def user.authenticatable_salt; ""; end
   end
 
   test 'should respond to remember_me attribute' do
-    assert resource_class.new.respond_to?(:remember_me)
-    assert resource_class.new.respond_to?(:remember_me=)
+    assert_respond_to resource_class.new, :remember_me
+    assert_respond_to resource_class.new, :remember_me=
   end
 
   test 'forget_me should clear remember_created_at if expire_all_remember_me_on_sign_out is true' do