diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 1e3216ab0f..ac32c82da6 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -5,7 +5,10 @@ class Bookmark < ActiveRecord::Base
   belongs_to :document, polymorphic: true
 
   validates_presence_of :user_id, :scope=>:document_id
-  attr_accessible :id, :document_id, :document_type, :title if Rails::VERSION::MAJOR < 4
+
+  if respond_to? :attr_accessible
+    attr_accessible :id, :document_id, :document_type, :title
+  end
 
   def document
     document_type.new document_type.unique_key => document_id
diff --git a/app/models/search.rb b/app/models/search.rb
index b47a76aa63..c636bcd92e 100644
--- a/app/models/search.rb
+++ b/app/models/search.rb
@@ -5,10 +5,13 @@ class Search < ActiveRecord::Base
 
   serialize :query_params
 
-  if Rails::VERSION::MAJOR < 4
+  if respond_to?(:attr_accessible)
     attr_accessible :query_params 
-  
-    scope :none, where(:id => nil).where("id IS NOT ?", nil)
+  end
+
+  unless respond_to?(:none)
+    # polyfill
+    scope :none, where(id: nil).where("id IS NOT ?", nil)
   end
 
   # A Search instance is considered a saved search if it has a user_id.
diff --git a/lib/generators/blacklight/user_generator.rb b/lib/generators/blacklight/user_generator.rb
index bb64f4ee9f..dfc9eea966 100644
--- a/lib/generators/blacklight/user_generator.rb
+++ b/lib/generators/blacklight/user_generator.rb
@@ -47,7 +47,9 @@ def inject_blacklight_user_behavior
       file_path = "app/models/#{model_name.underscore}.rb"
       if File.exists?(file_path)
         inject_into_class file_path, model_name.classify do
-          "\n  attr_accessible :email, :password, :password_confirmation if Rails::VERSION::MAJOR < 4\n" +
+          "\n  if respond_to? :attr_accessible\n" +
+          "\n    attr_accessible :email, :password, :password_confirmation" +
+          "\n  end\n" +
             "# Connects this user object to Blacklights Bookmarks. " +
             "\n  include Blacklight::User\n"
         end