2 files changed, 7 insertions, 3 deletions
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 23cebe2602..bf3079a1df 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -263,3 +263,10 @@ end
 class SerializedPost < ActiveRecord::Base
   serialize :title
 end
+
+class ConditionalStiPost < Post
+  default_scope { where(title: 'Untitled') }
+end
+
+class SubConditionalStiPost < ConditionalStiPost
+end
diff --git a/activerecord/test/models/user.rb b/activerecord/test/models/user.rb
index a40385e047..f5dc93e994 100644
--- a/activerecord/test/models/user.rb
+++ b/activerecord/test/models/user.rb
@@ -1,9 +1,6 @@
 class User < ActiveRecord::Base
   has_secure_token
   has_secure_token :auth_token
-  has_secure_token :conditional_token, if: :token_condition
-
-  attr_accessor :token_condition
 end
 
 class UserWithNotification < User