diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e25708f..ac42568 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,21 +8,14 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.6.8'
-          - '2.7.4'
+          - '2.7.6'
+          - '3.0.5'
+          - '3.1.4'
+          - '3.2.2'
         rails:
-          - '5.2'
-          - '6.0'
           - '6.1'
           - '7.0'
-        exclude:
-          - { ruby: '2.6.8', rails: '7.0' }
-        include:
-          # TODO: Move back into matrix when support for Rails 5.2 officially ends
-          - { ruby: '3.0.2', rails: '6.0' }
-          - { ruby: '3.0.2', rails: '6.1' }
-          - { ruby: '3.0.2', rails: '7.0' }
-
+          - '7.1'
     services:
       postgres:
         image: postgres:13
diff --git a/Appraisals b/Appraisals
index 8cb3c38..706da4c 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,15 +1,11 @@
-appraise '5.2' do
-  gem 'activerecord', '~> 5.2'
-end
-
-appraise '6.0' do
- gem 'activerecord', '~> 6.0'
-end
-
 appraise '6.1' do
- gem 'activerecord', '~> 6.1'
+  gem 'activerecord', '~> 6.1'
 end
 
 appraise '7.0' do
- gem 'activerecord', '~> 7.0'
+  gem 'activerecord', '~> 7.0'
+end
+
+appraise '7.1' do
+  gem 'activerecord', '~> 7.1'
 end
diff --git a/active_record_distinct_on.gemspec b/active_record_distinct_on.gemspec
index 40e6998..1b5793f 100644
--- a/active_record_distinct_on.gemspec
+++ b/active_record_distinct_on.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.files         = Dir['lib/**/*']
   spec.require_paths = %w{ lib }
 
-  spec.add_dependency 'activerecord', '>= 5.2', '< 7.1'
+  spec.add_dependency 'activerecord', '>= 6.1', '< 7.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '>= 12.3.3'
diff --git a/gemfiles/6.1.gemfile.lock b/gemfiles/6.1.gemfile.lock
index 3e7d6c8..0128ace 100644
--- a/gemfiles/6.1.gemfile.lock
+++ b/gemfiles/6.1.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    active_record_distinct_on (1.4.0)
-      activerecord (>= 5.2, < 7.1)
+    active_record_distinct_on (1.5.0)
+      activerecord (>= 6.1, < 7.2)
 
 GEM
   remote: https://rubygems.org/
@@ -30,6 +30,7 @@ GEM
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     minitest (5.14.4)
+    pg (1.5.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -68,6 +69,7 @@ DEPENDENCIES
   activerecord (~> 6.1)
   appraisal
   bundler
+  pg
   pry
   rake (>= 12.3.3)
   rspec
diff --git a/gemfiles/7-1.gemfile b/gemfiles/7-1.gemfile
new file mode 100644
index 0000000..eca365d
--- /dev/null
+++ b/gemfiles/7-1.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.1"
+
+gemspec path: "../"
diff --git a/gemfiles/7.0.gemfile.lock b/gemfiles/7.0.gemfile.lock
index 2fe5b8d..fe82dd2 100644
--- a/gemfiles/7.0.gemfile.lock
+++ b/gemfiles/7.0.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    active_record_distinct_on (1.4.0)
-      activerecord (>= 5.2, < 7.1)
+    active_record_distinct_on (1.5.0)
+      activerecord (>= 6.1, < 7.2)
 
 GEM
   remote: https://rubygems.org/
@@ -29,6 +29,7 @@ GEM
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     minitest (5.15.0)
+    pg (1.5.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -66,6 +67,7 @@ DEPENDENCIES
   activerecord (~> 7.0)
   appraisal
   bundler
+  pg
   pry
   rake (>= 12.3.3)
   rspec
diff --git a/gemfiles/7.1.gemfile b/gemfiles/7.1.gemfile
new file mode 100644
index 0000000..eca365d
--- /dev/null
+++ b/gemfiles/7.1.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.1"
+
+gemspec path: "../"
diff --git a/gemfiles/7.1.gemfile.lock b/gemfiles/7.1.gemfile.lock
new file mode 100644
index 0000000..f872bf6
--- /dev/null
+++ b/gemfiles/7.1.gemfile.lock
@@ -0,0 +1,91 @@
+PATH
+  remote: ..
+  specs:
+    active_record_distinct_on (1.5.0)
+      activerecord (>= 6.1, < 7.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.1.0)
+      activesupport (= 7.1.0)
+    activerecord (7.1.0)
+      activemodel (= 7.1.0)
+      activesupport (= 7.1.0)
+      timeout (>= 0.4.0)
+    activesupport (7.1.0)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    drb (2.1.1)
+      ruby2_keywords
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.20.0)
+    mutex_m (0.1.2)
+    pg (1.5.4)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    ruby2_keywords (0.0.5)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    sqlite3 (1.6.6-x86_64-linux)
+    thor (1.2.2)
+    timeout (0.4.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  active_record_distinct_on!
+  activerecord (~> 7.1)
+  appraisal
+  bundler
+  pg
+  pry
+  rake (>= 12.3.3)
+  rspec
+  simplecov
+  sqlite3
+
+BUNDLED WITH
+   2.4.13