diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 172591e..39ccb93 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,11 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1']
-        gemfile: [rails_5.0, rails_5.1, rails_5.2, rails_6.0, rails_6.1, rails_7.0]
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
+        gemfile: [rails_5.0, rails_5.1, rails_5.2, rails_6.0, rails_6.1, rails_7.0, rails_7.1]
         exclude:
           - ruby: '2.6'
             gemfile: rails_7.0
+          - ruby: '2.6'
+            gemfile: rails_7.1
           - ruby: '3.0'
             gemfile: rails_5.0
           - ruby: '3.0'
@@ -28,8 +30,24 @@ jobs:
             gemfile: rails_5.1
           - ruby: '3.1'
             gemfile: rails_5.2
-          - ruby: '3.1'
-            gemfile: rails_7.0
+          - ruby: '3.2'
+            gemfile: rails_5.0
+          - ruby: '3.2'
+            gemfile: rails_5.1
+          - ruby: '3.2'
+            gemfile: rails_5.2
+          - ruby: '3.3'
+            gemfile: rails_5.0
+          - ruby: '3.3'
+            gemfile: rails_5.1
+          - ruby: '3.3'
+            gemfile: rails_5.2
+          - ruby: '3.4'
+            gemfile: rails_5.0
+          - ruby: '3.4'
+            gemfile: rails_5.1
+          - ruby: '3.4'
+            gemfile: rails_5.2
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
 
@@ -39,6 +57,8 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+          bundler-cache: false
+      - name: Bundle install
+        run: bundle install
       - name: Run tests
         run: bundle exec rake
diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
index 0334047..b2813b6 100644
--- a/gemfiles/rails_5.0.gemfile
+++ b/gemfiles/rails_5.0.gemfile
@@ -4,5 +4,6 @@ gem 'activerecord', '~> 5.0.0'
 gem 'activesupport', '~> 5.0.0'
 gem 'railties', '~> 5.0.0'
 gem 'sqlite3', '~> 1.3.0'
+gem 'database_cleaner', '~> 1.99'
 
 gemspec path: '../'
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
index 62f4849..db7c77c 100644
--- a/gemfiles/rails_5.1.gemfile
+++ b/gemfiles/rails_5.1.gemfile
@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 5.1.0'
 gem 'activesupport', '~> 5.1.0'
 gem 'railties', '~> 5.1.0'
-gem 'sqlite3', '~> 1.3.0'
+gem 'sqlite3', '~> 1.4'
 
 gemspec path: '../'
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
new file mode 100644
index 0000000..52cb944
--- /dev/null
+++ b/gemfiles/rails_7.1.gemfile
@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.1.0'
+gem 'activesupport', '~> 7.1.0'
+gem 'railties', '~> 7.1.0'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+  gem 'sqlite3', '~> 2.0'
+else
+  gem 'sqlite3', '~> 1.4'
+end
+
+gemspec path: '../'
diff --git a/lib/simple_group/version.rb b/lib/simple_group/version.rb
index 85149ac..248728c 100644
--- a/lib/simple_group/version.rb
+++ b/lib/simple_group/version.rb
@@ -1,3 +1,3 @@
 module SimpleGroup
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end
diff --git a/simple_group.gemspec b/simple_group.gemspec
index 8f9f2d4..c6b0ba1 100644
--- a/simple_group.gemspec
+++ b/simple_group.gemspec
@@ -18,11 +18,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", '< 7.1.0', '>= 5.0.0'
-  spec.add_dependency "activesupport", '< 7.1.0', '>= 5.0.0'
-  spec.add_dependency "railties", '< 7.1.0', '>= 5.0.0'
+  spec.add_dependency "activerecord", '< 7.2.0', '>= 5.0.0'
+  spec.add_dependency "activesupport", '< 7.2.0', '>= 5.0.0'
+  spec.add_dependency "railties", '< 7.2.0', '>= 5.0.0'
+  spec.add_development_dependency "concurrent-ruby", '1.3.4'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency 'database_cleaner', '~> 2.0'
+  spec.add_development_dependency "sqlite3", '< 3.0', '>= 1.3'
+  spec.add_development_dependency 'database_cleaner', '< 3.0', '>= 1.99.0'
+  spec.add_development_dependency 'mutex_m', '~> 0.1'
+  spec.add_development_dependency 'base64', '~> 0.1'
+  spec.add_development_dependency 'bigdecimal', '~> 3.0'
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3a84794..40849e8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,7 @@
 require 'minitest/autorun'
 require 'active_record'
-require 'database_cleaner/active_record'
+# database_cleaner 1～2系のどちらでも動くようにするため、パスを修正
+require 'database_cleaner'
 require 'simple_group'
 require 'pry'