diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index f352e9495..f802596c3 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -281,6 +281,10 @@ axes:
   - id: ruby
     display_name: Ruby Version
     values:
+      - id: ruby-3.4
+        display_name: ruby-3.4
+        variables:
+           RVM_RUBY: ruby-3.4
       - id: ruby-3.3
         display_name: ruby-3.3
         variables:
@@ -399,13 +403,13 @@ buildvariants:
       - name: "test"
 
   - matrix_name: "special-os"
-    matrix_spec: { ruby: ["ruby-3.2", "ruby-3.1"], special-os: '*' }
+    matrix_spec: { ruby: ["ruby-3.4", "ruby-3.3"], special-os: '*' }
     display_name: "${ruby}, ${special-os}"
     tasks:
       - name: "test"
 
   - matrix_name: "jruby"
-    matrix_spec: { ruby: ["jruby-10.0", "jruby-9.4", "jruby-9.3"], all-os: ubuntu2204 }
+    matrix_spec: { ruby: ["jruby-10.0", "jruby-9.4", "jruby-9.3"], all-os: ubuntu2404 }
     display_name: "${ruby}, ${all-os}"
     tasks:
       - name: "test"
diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb
index d4a61541a..34356f590 100644
--- a/.evergreen/config/variants.yml.erb
+++ b/.evergreen/config/variants.yml.erb
@@ -45,7 +45,7 @@ buildvariants:
       - name: "test"
 
   - matrix_name: "jruby"
-    matrix_spec: { ruby: <%= jrubies %>, all-os: ubuntu2204 }
+    matrix_spec: { ruby: <%= jrubies %>, all-os: ubuntu2404 }
     display_name: "${ruby}, ${all-os}"
     tasks:
       - name: "test"
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index fac2776c2..e11be73fc 100644
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -13,15 +13,25 @@ set -o errexit  # Exit the script with error if any of the commands fail
 
 set_env_vars
 
-set_env_ruby
-
-install_deps
+# Install rbenv and download the requested ruby version
+rm -rf ~/.rbenv
+git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+rm -rf ~/.rbenv/versions/
+curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
+export PATH="$HOME/.rbenv/bin:$PATH"
+eval "$(rbenv init - bash)"
+export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
+rbenv global $FULL_RUBY_VERSION
 
 # TODO: move this to shared/shlib/set_env.sh
 export JAVA_HOME="/opt/java/jdk21"
+export JAVACMD=$JAVA_HOME/bin/java
 export SOURCE_VERSION=21
 export TARGET_VERSION=21
 # END TODO
+
+install_deps
+
 export CI=1
 echo "Running specs"
 bundle exec rake spec
diff --git a/.evergreen/update-evergreen-configs b/.evergreen/update-evergreen-configs
index cddc1e3eb..fdaeaa0d1 100755
--- a/.evergreen/update-evergreen-configs
+++ b/.evergreen/update-evergreen-configs
@@ -75,7 +75,7 @@ module ConfigProcessor
 
   # these are used for testing against a few recent ruby versions
   def recent_rubies
-    @recent_rubies ||= %w[ ruby-3.2 ruby-3.1 jruby-10.0 ]
+    @recent_rubies ||= %w[ ruby-3.4 ruby-3.3 jruby-10.0 ]
   end
 
   # the most recently released, stable version of Ruby (make sure this
@@ -112,7 +112,7 @@ module ConfigProcessor
   # all supported MRI ruby versions
   def supported_mri_rubies
     @supported_mri_rubies ||= %w[
-      ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0
+      ruby-3.4 ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0
       ruby-2.7
     ]
   end