diff --git a/.github/workflows/jruby.yml b/.github/workflows/jruby.yml
index 7a3ec1be..5ac8c162 100644
--- a/.github/workflows/jruby.yml
+++ b/.github/workflows/jruby.yml
@@ -1,11 +1,11 @@
-name: JRuby
+name: JRuby tests
 on:
   push:
     branches:
-      - main
+      - 8.x
   pull_request:
     branches:
-      - main
+      - 8.x
   workflow_dispatch:
     branches:
       - '*'
@@ -13,12 +13,15 @@ jobs:
   tests:
     env:
       TEST_ES_SERVER: http://localhost:9200
-      RAILS_VERSIONS: '5.0,6.0'
+      RAILS_VERSIONS: ${{ matrix.rails }}
     strategy:
       fail-fast: false
+      matrix:
+        rails: [ '6.1', '7.0', '7.1' ]
+        ruby: ['jruby-9.4']
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Increase system limits
       run: |
         sudo swapoff -a
@@ -27,13 +30,14 @@ jobs:
         sudo sysctl -w vm.max_map_count=262144
     - uses: elastic/elastic-github-actions/elasticsearch@master
       with:
-        stack-version: 7.x-SNAPSHOT
+        stack-version: 8.14.0-SNAPSHOT
+        security-enabled: false
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: jruby-9.3
+        ruby-version: ${{ matrix.ruby }}
     - name: Bundle
       run: |
-        sudo apt-get install libsqlite3-dev
+        sudo apt-get install libsqlite3-dev libcurl4-openssl-dev
         gem install bundler
         bundle install
         bundle exec rake bundle:clean
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2cc6457a..ff76e392 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,4 +1,4 @@
-name: Ruby 3.0
+name: Ruby tests
 on:
   push:
     branches:
diff --git a/Gemfile b/Gemfile
index b04ce3e9..ddb9b7bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem 'pry'
 gem 'rake', '~> 12'
 
 group :development do
-  gem 'debug'
+  gem 'debug' unless defined?(JRUBY_VERSION)
   gem 'rspec'
   gem 'yard'
 end
diff --git a/elasticsearch-model/Gemfile b/elasticsearch-model/Gemfile
index 72fae31b..58f5b6b9 100644
--- a/elasticsearch-model/Gemfile
+++ b/elasticsearch-model/Gemfile
@@ -21,7 +21,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :testing do
-  gem 'debug'
+  gem 'debug' unless defined?(JRUBY_VERSION)
   gem 'pry-nav'
   gem 'rspec'
 end
diff --git a/elasticsearch-persistence/Gemfile b/elasticsearch-persistence/Gemfile
index 2afccf28..4e228558 100644
--- a/elasticsearch-persistence/Gemfile
+++ b/elasticsearch-persistence/Gemfile
@@ -25,7 +25,7 @@ gem 'elasticsearch-model',
     require: false
 
 group :development, :testing do
-  gem 'debug'
+  gem 'debug' unless defined?(JRUBY_VERSION)
   gem 'pry-nav'
   gem 'rspec'
 end
diff --git a/elasticsearch-rails/Gemfile b/elasticsearch-rails/Gemfile
index 2f333c4b..f51541c7 100644
--- a/elasticsearch-rails/Gemfile
+++ b/elasticsearch-rails/Gemfile
@@ -29,8 +29,10 @@ gem 'elasticsearch-persistence',
     require: false
 
 group :development, :testing do
-  gem 'debug'
   gem 'pry-nav'
   gem 'rspec'
-  gem 'sqlite3' unless defined?(JRUBY_VERSION)
+  unless defined?(JRUBY_VERSION)
+    gem 'sqlite3'
+    gem 'debug'
+  end
 end