diff --git a/lib/searchkick.rb b/lib/searchkick.rb
index ee1a578..dc431e1 100644
--- a/lib/searchkick.rb
+++ b/lib/searchkick.rb
@@ -296,13 +296,15 @@ module Searchkick
 
   # private
   def self.not_found_error?(e)
-    (defined?(Elasticsearch) && e.is_a?(Elasticsearch::Transport::Transport::Errors::NotFound)) ||
+    (defined?(Elastic::Transport) && e.is_a?(Elastic::Transport::Transport::Errors::NotFound)) ||
+    (defined?(Elasticsearch::Transport) && e.is_a?(Elasticsearch::Transport::Transport::Errors::NotFound)) ||
     (defined?(OpenSearch) && e.is_a?(OpenSearch::Transport::Transport::Errors::NotFound))
   end
 
   # private
   def self.transport_error?(e)
-    (defined?(Elasticsearch) && e.is_a?(Elasticsearch::Transport::Transport::Error)) ||
+    (defined?(Elastic::Transport) && e.is_a?(Elastic::Transport::Transport::Error)) ||
+    (defined?(Elasticsearch::Transport) && e.is_a?(Elasticsearch::Transport::Transport::Error)) ||
     (defined?(OpenSearch) && e.is_a?(OpenSearch::Transport::Transport::Error))
   end
 end
diff --git a/test/search_test.rb b/test/search_test.rb
index 20f41ae..307f6d1 100644
--- a/test/search_test.rb
+++ b/test/search_test.rb
@@ -67,7 +67,15 @@ class SearchTest < Minitest::Test
   end
 
   def test_unsupported_version
-    raises_exception = ->(_) { raise Elasticsearch::Transport::Transport::Error, "[500] No query registered for [multi_match]" }
+    skip if Searchkick.opensearch?
+
+    raises_exception = lambda do |*|
+      if defined?(Elastic::Transport)
+        raise Elastic::Transport::Transport::Error, "[500] No query registered for [multi_match]"
+      else
+        raise Elasticsearch::Transport::Transport::Error, "[500] No query registered for [multi_match]"
+      end
+    end
     Searchkick.client.stub :search, raises_exception do
       assert_raises(Searchkick::UnsupportedVersionError) { Product.search("test") }
     end
--
libgit2 0.21.0