diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index c0e60fbb8a..01739d8ae4 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -60,12 +60,12 @@ module ActiveModel
           # This ensures the model has a password by checking whether the password_digest
           # is present, so that this works with both new and existing records. However,
           # when there is an error, the message is added to the password attribute instead
-          # so that the error message will makes sense to the end-user.
+          # so that the error message will make sense to the end-user.
           validate do |record|
             record.errors.add(:password, :blank) unless record.password_digest.present?
           end
 
-          validates_confirmation_of :password, if: ->{ self.password.present? }
+          validates_confirmation_of :password, if: ->{ password.present? }
         end
 
         if respond_to?(:attributes_protected_by_default)
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 174d18ec8b..82fd291064 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -2,7 +2,6 @@ require 'cases/helper'
 require 'models/user'
 require 'models/visitor'
 
-require 'active_support/all'
 class SecurePasswordTest < ActiveModel::TestCase
   setup do
     ActiveModel::SecurePassword.min_cost = true