diff --git a/lib/searchlight/adapters/action_view.rb b/lib/searchlight/adapters/action_view.rb
index e7387a6..0334df7 100644
--- a/lib/searchlight/adapters/action_view.rb
+++ b/lib/searchlight/adapters/action_view.rb
@@ -6,9 +6,9 @@ module Searchlight
   module Adapters
     module ActionView
 
-      include ::ActiveModel::Conversion
 
       def self.included(search_class)
+        search_class.include ::ActiveModel::Conversion
         search_class.extend ::ActiveModel::Naming
       end
 
diff --git a/searchlight.gemspec b/searchlight.gemspec
index db9bd65..9b86aaf 100644
--- a/searchlight.gemspec
+++ b/searchlight.gemspec
@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rspec",     "~> 3.2"
-  spec.add_development_dependency "bundler",   "~> 1.3"
+  spec.add_development_dependency "bundler",   ">= 2.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "capybara",  "~> 2.4"
 
   # To test integration with actionview and activerecord
-  spec.add_development_dependency "actionview",         "~> 4.1"
-  spec.add_development_dependency "activemodel",        "~> 4.1"
+  spec.add_development_dependency "actionview",         "~> 8.1"
+  spec.add_development_dependency "activemodel",        "~> 8.1"
 end
diff --git a/spec/searchlight/adapters/action_view_spec.rb b/spec/searchlight/adapters/action_view_spec.rb
index b9c11fc..c75bf38 100644
--- a/spec/searchlight/adapters/action_view_spec.rb
+++ b/spec/searchlight/adapters/action_view_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Searchlight::Adapters::ActionView", type: :feature do
 
-  let(:view)   { ::ActionView::Base.new }
+  let(:view)   { ::ActionView::Base.with_empty_template_cache.with_view_paths(nil, {}) }
   let(:search) { BookSearch.new("title_like" => "Love Among the Chickens") }
 
   before :all do