diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 183bf87..096224c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,14 +20,16 @@ jobs:
     strategy:
       matrix:
         ruby: [2.4, 2.7, '3.0', 3.1, 3.2]
-        rails: [4, 5, 6.0, 6.1, 7.0]
+        rails: [4, 5, 6.0, 6.1, '7.0', 7.1]
         exclude:
           - ruby: 2.4
             rails: 6.0
           - ruby: 2.4
             rails: 6.1
           - ruby: 2.4
-            rails: 7.0
+            rails: '7.0'
+          - ruby: 2.4
+            rails: 7.1
           - ruby: 2.7
             rails: 4
           - ruby: '3.0'
@@ -50,7 +52,7 @@ jobs:
             rails: 6.1
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: ruby/setup-ruby@v1
       with:
diff --git a/Gemfile b/Gemfile
index fa75df1..0c3f7d8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,19 @@
 source 'https://rubygems.org'
 
 gemspec
+
+pg_version = '< 1' if ENV['RAILS_VERSION'].to_s.split.last.to_i == 4
+
+group :development, :test do
+  gem 'pg', pg_version
+  gem 'rake'
+  gem 'rubocop-performance'
+  gem 'rubocop-rspec'
+  gem 'yardstick'
+end
+
+group :test do
+  gem 'ffaker'
+  gem 'rspec'
+  gem 'simplecov'
+end
diff --git a/active_record-pgcrypto.gemspec b/active_record-pgcrypto.gemspec
index b695169..dc064c2 100644
--- a/active_record-pgcrypto.gemspec
+++ b/active_record-pgcrypto.gemspec
@@ -19,16 +19,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', ENV.fetch('RAILS_VERSION', '>= 3.2')
 
-  pg_version = '< 1' if ENV['RAILS_VERSION'].to_s.split.last.to_i == 4
-
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'ffaker'
-  spec.add_development_dependency 'pg', pg_version
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'yardstick'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/spec/active_record/pgcrypto/log_subscriber_spec.rb b/spec/active_record/pg_crypto/log_subscriber_spec.rb
similarity index 100%
rename from spec/active_record/pgcrypto/log_subscriber_spec.rb
rename to spec/active_record/pg_crypto/log_subscriber_spec.rb
diff --git a/spec/active_record/pgcrypto/symmetric_coder_spec.rb b/spec/active_record/pg_crypto/symmetric_coder_spec.rb
similarity index 100%
rename from spec/active_record/pgcrypto/symmetric_coder_spec.rb
rename to spec/active_record/pg_crypto/symmetric_coder_spec.rb
diff --git a/spec/integration/model_spec.rb b/spec/integration/user_spec.rb
similarity index 100%
rename from spec/integration/model_spec.rb
rename to spec/integration/user_spec.rb