3 files changed, 11 insertions, 2 deletions
diff --git a/activemodel/test/models/administrator.rb b/activemodel/test/models/administrator.rb
index a48f8b064f..2d6d34b3e2 100644
--- a/activemodel/test/models/administrator.rb
+++ b/activemodel/test/models/administrator.rb
@@ -1,7 +1,10 @@
 class Administrator
+  extend ActiveModel::Callbacks
   include ActiveModel::Validations
   include ActiveModel::SecurePassword
   include ActiveModel::MassAssignmentSecurity
+  
+  define_model_callbacks :create
 
   attr_accessor :name, :password_digest
   attr_accessible :name
diff --git a/activemodel/test/models/user.rb b/activemodel/test/models/user.rb
index e221bb8091..4b11df12bf 100644
--- a/activemodel/test/models/user.rb
+++ b/activemodel/test/models/user.rb
@@ -1,6 +1,9 @@
 class User
+  extend ActiveModel::Callbacks
   include ActiveModel::Validations
   include ActiveModel::SecurePassword
+  
+  define_model_callbacks :create
 
   has_secure_password
 
diff --git a/activemodel/test/models/visitor.rb b/activemodel/test/models/visitor.rb
index 36c0a16688..d15f448516 100644
--- a/activemodel/test/models/visitor.rb
+++ b/activemodel/test/models/visitor.rb
@@ -1,9 +1,12 @@
 class Visitor
+  extend ActiveModel::Callbacks
   include ActiveModel::Validations
   include ActiveModel::SecurePassword
   include ActiveModel::MassAssignmentSecurity
+  
+  define_model_callbacks :create
 
-  has_secure_password
+  has_secure_password(validations: false)
 
-  attr_accessor :password_digest
+  attr_accessor :password_digest, :password_confirmation
 end