diff --git a/.tool-versions b/.tool-versions
index 974865f..5de817e 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-ruby 2.7.6
+ruby 3.0.5
diff --git a/test/concern_test.rb b/test/concern_test.rb
index a0482eb..9bdfa24 100644
--- a/test/concern_test.rb
+++ b/test/concern_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest_helper'
+require 'test_helper'
 
 describe 'with_advisory_lock.concern' do
   it 'adds with_advisory_lock to ActiveRecord classes' do
diff --git a/test/lock_test.rb b/test/lock_test.rb
index a3f343a..82bf059 100644
--- a/test/lock_test.rb
+++ b/test/lock_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest_helper'
+require 'test_helper'
 
 describe 'class methods' do
   let(:lock_name) { 'test lock' }
diff --git a/test/nesting_test.rb b/test/nesting_test.rb
index d7bba81..d729357 100644
--- a/test/nesting_test.rb
+++ b/test/nesting_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest_helper'
+require 'test_helper'
 
 describe 'lock nesting' do
   # This simplifies what we expect from the lock name:
diff --git a/test/options_test.rb b/test/options_test.rb
index c0e6a6e..74fa346 100644
--- a/test/options_test.rb
+++ b/test/options_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest_helper'
+require 'test_helper'
 
 describe 'options parsing' do
   def parse_options(options)
diff --git a/test/parallelism_test.rb b/test/parallelism_test.rb
index 48e70a0..4b1ed86 100644
--- a/test/parallelism_test.rb
+++ b/test/parallelism_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest_helper'
+require 'test_helper'
 require 'forwardable'
 
 describe 'parallelism' do
diff --git a/test/shared_test.rb b/test/shared_test.rb
index 04760c2..32b3269 100644
--- a/test/shared_test.rb
+++ b/test/shared_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest_helper'
+require 'test_helper'
 
 describe 'shared locks' do
   def supported?
diff --git a/test/minitest_helper.rb b/test/test_helper.rb
similarity index 97%
rename from test/minitest_helper.rb
rename to test/test_helper.rb
index 2b57426..f28bb1b 100644
--- a/test/minitest_helper.rb
+++ b/test/test_helper.rb
@@ -29,7 +29,7 @@ def env_db
 
 require 'test_models'
 require 'minitest'
-require 'minitest/autorun'
+require 'maxitest/autorun'
 require 'minitest/great_expectations'
 require 'mocha/minitest'
 
diff --git a/test/thread_test.rb b/test/thread_test.rb
index f3d08a3..0c486e1 100644
--- a/test/thread_test.rb
+++ b/test/thread_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest_helper'
+require 'test_helper'
 
 describe 'separate thread tests' do
   let(:lock_name) { 'testing 1,2,3' } # OMG COMMAS
diff --git a/test/transaction_test.rb b/test/transaction_test.rb
index 94cc75d..e0e224f 100644
--- a/test/transaction_test.rb
+++ b/test/transaction_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest_helper'
+require 'test_helper'
 
 describe 'transaction scoping' do
   def supported?
diff --git a/with_advisory_lock.gemspec b/with_advisory_lock.gemspec
index f802bcf..055b182 100644
--- a/with_advisory_lock.gemspec
+++ b/with_advisory_lock.gemspec
@@ -5,28 +5,29 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require_relative 'lib/with_advisory_lock/version'
 
-Gem::Specification.new do |gem|
-  gem.name          = 'with_advisory_lock'
-  gem.version       = WithAdvisoryLock::VERSION
-  gem.authors       = ['Matthew McEachen', 'Abdelkader Boudih']
-  gem.email         = %w[matthew+github@mceachen.org terminale@gmail.com]
-  gem.homepage      = 'https://github.com/ClosureTree/with_advisory_lock'
-  gem.summary       = 'Advisory locking for ActiveRecord'
-  gem.description   = 'Advisory locking for ActiveRecord'
-  gem.license       = 'MIT'
+Gem::Specification.new do |spec|
+  spec.name          = 'with_advisory_lock'
+  spec.version       = WithAdvisoryLock::VERSION
+  spec.authors       = ['Matthew McEachen', 'Abdelkader Boudih']
+  spec.email         = %w[matthew+github@mceachen.org terminale@gmail.com]
+  spec.homepage      = 'https://github.com/ClosureTree/with_advisory_lock'
+  spec.summary       = 'Advisory locking for ActiveRecord'
+  spec.description   = 'Advisory locking for ActiveRecord'
+  spec.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  gem.test_files    = gem.files.grep(%r{^test/})
-  gem.require_paths = %w[lib]
-  gem.metadata      = { "rubygems_mfa_required" => "true" }
-  gem.required_ruby_version = '>= 2.6.8'
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.test_files    = spec.files.grep(%r{^test/})
+  spec.require_paths = %w[lib]
+  spec.metadata      = { "rubyspecs_mfa_required" => "true" }
+  spec.required_ruby_version = '>= 2.6.8'
+  spec.metadata["yard.run"] = "yri"
 
-  gem.add_runtime_dependency 'activerecord', '>= 6.0'
+  spec.add_runtime_dependency 'activerecord', '>= 6.0'
 
-  gem.add_development_dependency 'appraisal'
-  gem.add_development_dependency 'minitest'
-  gem.add_development_dependency 'minitest-great_expectations'
-  gem.add_development_dependency 'minitest-reporters'
-  gem.add_development_dependency 'mocha'
-  gem.add_development_dependency 'yard'
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'maxitest'
+  spec.add_development_dependency 'minitest-great_expectations'
+  spec.add_development_dependency 'minitest-reporters'
+  spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'yard'
 end