diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd0c8a29..a603b679 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     name: cross-compile-windows
     runs-on: ubuntu-22.04
     container:
-      image: "ghcr.io/rake-compiler/rake-compiler-dock-image:1.4.0-mri-${{ matrix.platform }}"
+      image: "ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-${{ matrix.platform }}"
     steps:
       - uses: actions/checkout@v4
 
@@ -181,6 +181,7 @@ jobs:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
 
     name: install-windows-ucrt
     runs-on: windows-latest
@@ -230,6 +231,8 @@ jobs:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
+
     name: test-windows-ucrt
     runs-on: windows-latest
     steps:
@@ -305,6 +308,7 @@ jobs:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
 
     name: install-windows-native
     runs-on: windows-latest
@@ -340,7 +344,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3
+          ruby-version: 3.4
           bundler-cache: true
 
       - name: Write used versions into file
@@ -376,6 +380,8 @@ jobs:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
+
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -439,6 +445,7 @@ jobs:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
 
     name: install-macos-m1
     runs-on: macos-14
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50e148e7..3128e1ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.1.0
+
+* Add Ruby 3.4 to the cross compile list
+
 ## 3.0.0
 
 * Drop support for Ruby < 2.7
diff --git a/Rakefile b/Rakefile
index f7580918..9999bff6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,7 +7,7 @@ require_relative './ext/tiny_tds/extconsts'
 
 SPEC = Gem::Specification.load(File.expand_path('../tiny_tds.gemspec', __FILE__))
 
-ruby_cc_ucrt_versions = "3.3.0:3.2.0:3.1.0".freeze
+ruby_cc_ucrt_versions = "3.4.0:3.3.5:3.2.0:3.1.0".freeze
 ruby_cc_mingw32_versions = "3.0.0:2.7.0".freeze
 
 GEM_PLATFORM_HOSTS = {
diff --git a/VERSION b/VERSION
index 4a36342f..fd2a0186 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.0
+3.1.0
diff --git a/test/gem_test.rb b/test/gem_test.rb
index b05a8edc..0412a88a 100644
--- a/test/gem_test.rb
+++ b/test/gem_test.rb
@@ -2,7 +2,7 @@
 require 'test_helper'
 require 'tiny_tds/gem'
 
-class GemTest < MiniTest::Spec
+class GemTest < Minitest::Spec
   gem_root ||= File.expand_path '../..', __FILE__
 
   describe TinyTds::Gem do
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 82ca1a6d..640d8c0c 100755
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,7 +10,7 @@
 TINYTDS_SCHEMAS = ['sqlserver_2017', 'sqlserver_azure'].freeze
 
 module TinyTds
-  class TestCase < MiniTest::Spec
+  class TestCase < Minitest::Spec
 
     class << self
 
diff --git a/tiny_tds.gemspec b/tiny_tds.gemspec
index 7183733e..e50f3bbe 100644
--- a/tiny_tds.gemspec
+++ b/tiny_tds.gemspec
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mini_portile2', '~> 2.5.0'
   s.add_development_dependency 'rake', '~> 13.0.0'
   s.add_development_dependency 'rake-compiler', '~> 1.2'
-  s.add_development_dependency 'rake-compiler-dock', '~> 1.4.0'
-  s.add_development_dependency 'minitest', '~> 5.14.0'
+  s.add_development_dependency 'rake-compiler-dock', '~> 1.7.0'
+  s.add_development_dependency 'minitest', '~> 5.25'
   s.add_development_dependency 'minitest-reporters', '~> 1.6.1'
   s.add_development_dependency 'connection_pool', '~> 2.2.0'
   s.add_development_dependency 'toxiproxy', '~> 2.0.0'