diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index edfb6eea45..234ade3297 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,7 +5,7 @@ steps:
     env:
       RUBY_VERSION: "{{ matrix.ruby }}"
       TEST_SUITE: "{{ matrix.suite }}"
-      STACK_VERSION: 8.13.0-SNAPSHOT
+      STACK_VERSION: 8.13.5-SNAPSHOT
       TRANSPORT_VERSION: "{{ matrix.transport }}"
       RUBY_SOURCE: "{{ matrix.ruby_source }}"
     matrix:
diff --git a/.github/workflows/8.13.yml b/.github/workflows/8.13.yml
index 0665a8c76f..28aa316eb4 100644
--- a/.github/workflows/8.13.yml
+++ b/.github/workflows/8.13.yml
@@ -26,7 +26,7 @@ jobs:
         sudo sysctl -w vm.max_map_count=262144
     - uses: elastic/elastic-github-actions/elasticsearch@master
       with:
-        stack-version: 8.13.0-SNAPSHOT
+        stack-version: 8.13.5-SNAPSHOT
         security-enabled: false
     - uses: ruby/setup-ruby@v1
       with:
@@ -40,4 +40,4 @@ jobs:
     - name: elasticsearch
       run: cd elasticsearch && bundle exec rake test:all
     - name: elasticsearch-api
-      run: rake elasticsearch:download_artifacts[8.13.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
+      run: rake elasticsearch:download_artifacts[8.13.5-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
diff --git a/.github/workflows/otel.yml b/.github/workflows/otel.yml
index 717cb47447..d09dbeeab4 100644
--- a/.github/workflows/otel.yml
+++ b/.github/workflows/otel.yml
@@ -28,7 +28,7 @@ jobs:
           sudo sysctl -w vm.max_map_count=262144
       - uses: elastic/elastic-github-actions/elasticsearch@master
         with:
-          stack-version: 8.13.0-SNAPSHOT
+          stack-version: 8.13.5-SNAPSHOT
           security-enabled: false
       - uses: ruby/setup-ruby@v1
         with:
@@ -42,4 +42,4 @@ jobs:
       - name: elasticsearch
         run: cd elasticsearch && bundle exec rake test:all
       - name: elasticsearch-api
-        run: rake elasticsearch:download_artifacts[8.13.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
+        run: rake elasticsearch:download_artifacts[8.13.5-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
diff --git a/elasticsearch/spec/integration/characters_escaping_spec.rb b/elasticsearch/spec/integration/characters_escaping_spec.rb
index 7241bf1f24..f109b1ba23 100644
--- a/elasticsearch/spec/integration/characters_escaping_spec.rb
+++ b/elasticsearch/spec/integration/characters_escaping_spec.rb
@@ -14,11 +14,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+require 'spec_helper'
+
 ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
 raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
 
-require 'spec_helper'
-
 context 'Elasticsearch client' do
   let(:client) do
     Elasticsearch::Client.new(host: ELASTICSEARCH_URL, user: 'elastic', password: 'changeme')
diff --git a/elasticsearch/spec/integration/client_integration_spec.rb b/elasticsearch/spec/integration/client_integration_spec.rb
index 2ae47d70e9..a07d3e74d4 100644
--- a/elasticsearch/spec/integration/client_integration_spec.rb
+++ b/elasticsearch/spec/integration/client_integration_spec.rb
@@ -14,12 +14,12 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
-raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
-
 require 'spec_helper'
 require 'logger'
 
+ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
+raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+
 context 'Elasticsearch client' do
   let(:logger) { Logger.new($stderr) }
 
diff --git a/rake_tasks/elasticsearch_tasks.rake b/rake_tasks/elasticsearch_tasks.rake
index 919a8a39b6..268790f29e 100644
--- a/rake_tasks/elasticsearch_tasks.rake
+++ b/rake_tasks/elasticsearch_tasks.rake
@@ -43,8 +43,8 @@ namespace :elasticsearch do
 
   def download_file!(url, filename)
     puts "Downloading #{filename} from #{url}"
-    File.open(filename, "w") do |downloaded_file|
-      URI.open(url, "rb") do |artifact_file|
+    File.open(filename, 'w') do |downloaded_file|
+      URI.open(url, 'rb') do |artifact_file|
         downloaded_file.write(artifact_file.read)
       end
     end
@@ -54,8 +54,11 @@ namespace :elasticsearch do
       warn "[!] Couldn't download #{filename}"
       exit 1
     end
+  rescue OpenURI::HTTPError => e
+    abort e.message
   rescue StandardError => e
-    abort e
+    puts e.backtrace.join("\n\t")
+    abort e.message
   end
 
   desc 'Download artifacts (tests and REST spec) for currently running cluster'