diff --git a/app/logical/mentionable.rb b/app/logical/mentionable.rb
index 355fa6362..9a2c9613d 100644
--- a/app/logical/mentionable.rb
+++ b/app/logical/mentionable.rb
@@ -1,6 +1,10 @@
 module Mentionable
   extend ActiveSupport::Concern
 
+  included do
+    attr_accessor :skip_mention_notifications
+  end
+
   module ClassMethods
     # options:
     # - message_field
diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb
index 293487b68..38c4fffe8 100644
--- a/app/models/forum_post.rb
+++ b/app/models/forum_post.rb
@@ -3,7 +3,6 @@ class ForumPost < ApplicationRecord
 
   attr_accessible :body, :topic_id, :as => [:member, :builder, :gold, :platinum, :admin, :moderator, :default]
   attr_accessible :is_locked, :is_sticky, :is_deleted, :as => [:admin, :moderator]
-  attr_accessor :skip_mention_notifications # used by `Mentionable::queue_mention_messages`
   attr_readonly :topic_id
   belongs_to :creator, :class_name => "User"
   belongs_to :updater, :class_name => "User"
diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb
index c56bfc51a..22b293011 100644
--- a/test/unit/post_test.rb
+++ b/test/unit/post_test.rb
@@ -21,6 +21,7 @@ class PostTest < ActiveSupport::TestCase
     CurrentUser.user = @user
     CurrentUser.ip_addr = "127.0.0.1"
     mock_saved_search_service!
+    mock_pool_archive_service!
     ImageCropper.stubs(:enabled?).returns(false)
   end