diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6752568c9c..9f501ddbcc 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -8,7 +8,6 @@ steps:
           - "3.4"
           - "3.3"
           - "3.2"
-          - "3.1"
         ruby_source:
           - "ruby"
         transport:
@@ -17,16 +16,12 @@ steps:
         - with: # JRuby tests
             ruby: "9.4"
             ruby_source: "jruby"
-            transport: "8.3"
+            transport: "8.4"
         # Test for different versions of transport
         - with:
             ruby: "3.4"
             ruby_source: "ruby"
             transport: "main"
-        - with:
-            ruby: "3.4"
-            ruby_source: "ruby"
-            transport: "8.2"
     env:
       RUBY_VERSION: "{{ matrix.ruby }}"
       STACK_VERSION: 9.1.0-SNAPSHOT
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f695527199..b1d5d5a65f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.1', '3.2', '3.3', '3.4', 'jruby-9.3', 'jruby-9.4']
+        ruby: ['head', '3.2', '3.3', '3.4', 'jruby-9.3', 'jruby-9.4', 'jruby-head']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
diff --git a/elasticsearch-api/spec/unit/perform_request_spec.rb b/elasticsearch-api/spec/unit/perform_request_spec.rb
index 6860194075..0965b56e49 100644
--- a/elasticsearch-api/spec/unit/perform_request_spec.rb
+++ b/elasticsearch-api/spec/unit/perform_request_spec.rb
@@ -27,7 +27,10 @@
             spec.visibility != 'public' ||
             # TODO: Once the test suite is migrated to elasticsearch-specification, these should be removed
             spec.module_namespace.flatten.first == 'rollup' ||
-            ['scroll', 'clear_scroll', 'connector.last_sync', 'inference.put_eis'].include?(spec.endpoint_name)
+            [
+              'scroll', 'clear_scroll', 'connector.last_sync', 'inference.put_eis', 'esql.get_query',
+              'esql.list_queries'
+            ].include?(spec.endpoint_name)
 
     # These are the path parts defined by the user in the method argument
     defined_path_parts = spec.path_params.inject({}) do |params, part|
diff --git a/elasticsearch/elasticsearch.gemspec b/elasticsearch/elasticsearch.gemspec
index c9159c6be4..563638b546 100644
--- a/elasticsearch/elasticsearch.gemspec
+++ b/elasticsearch/elasticsearch.gemspec
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'base64'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'debug' unless defined?(JRUBY_VERSION)
+  s.add_development_dependency 'ostruct'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)