diff --git a/.ruby-version b/.ruby-version
index f13c6f4..e391e18 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-3.3.5
+ruby-3.3.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b78001..b18d64f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
-No notable changes.
+### Changed
+* Test against Active Record 8.0 ([#685](https://github.com/haines/pg-aws_rds_iam/pull/685))
+* Use `URI::RFC2396_PARSER.regexp[:ABS_URI_REF]` directly to resolve deprecation warning introduced in [ruby/uri#113](https://github.com/ruby/uri/pull/113) ([#685](https://github.com/haines/pg-aws_rds_iam/pull/685))
 
 ## [0.6.0] - 2024-10-30
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f622c73..f9745d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,30 +8,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.2.2)
-      actionview (= 7.2.2)
-      activesupport (= 7.2.2)
+    actionpack (8.0.0)
+      actionview (= 8.0.0)
+      activesupport (= 8.0.0)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.2)
-      activesupport (= 7.2.2)
+    actionview (8.0.0)
+      activesupport (= 8.0.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activemodel (7.2.2)
-      activesupport (= 7.2.2)
-    activerecord (7.2.2)
-      activemodel (= 7.2.2)
-      activesupport (= 7.2.2)
+    activemodel (8.0.0)
+      activesupport (= 8.0.0)
+    activerecord (8.0.0)
+      activemodel (= 8.0.0)
+      activesupport (= 8.0.0)
       timeout (>= 0.4.0)
-    activesupport (7.2.2)
+    activesupport (8.0.0)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -43,6 +42,7 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     ansi (1.5.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
@@ -61,7 +61,7 @@ GEM
     aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
-    benchmark (0.3.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
     coderay (1.1.3)
@@ -120,9 +120,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.2.2)
-      actionpack (= 7.2.2)
-      activesupport (= 7.2.2)
+    railties (8.0.0)
+      actionpack (= 8.0.0)
+      activesupport (= 8.0.0)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -154,14 +154,15 @@ GEM
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.1)
+    securerandom (0.3.2)
     stringio (3.1.1)
     thor (1.3.2)
     timecop (0.9.10)
-    timeout (0.4.1)
+    timeout (0.4.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
+    uri (1.0.1)
     useragent (0.16.10)
     yard (0.9.37)
     zeitwerk (2.6.18)
@@ -189,4 +190,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.5.22
+   2.5.23
diff --git a/bin/version-matrix b/bin/version-matrix
index 9b5c5c1..eaba5e5 100755
--- a/bin/version-matrix
+++ b/bin/version-matrix
@@ -9,7 +9,7 @@ def minor_versions(name, requirement)
 end
 
 ruby_activerecord_requirements = {
-  "3.1" => ">= 6.1",
+  "3.1" => [">= 6.1", "< 8"],
   "3.2" => ">= 6.1",
   "3.3" => ">= 6.1"
 }
@@ -24,7 +24,8 @@ activerecord_pg_requirements = {
   "6.1" => "~> 1.1",
   "7.0" => "~> 1.1",
   "7.1" => "~> 1.1",
-  "7.2" => "~> 1.1"
+  "7.2" => "~> 1.1",
+  "8.0" => "~> 1.1"
 }
 
 versions = ruby_activerecord_requirements.flat_map do |ruby_version, activerecord_requirement|
diff --git a/lib/pg/aws_rds_iam/connection_info/uri.rb b/lib/pg/aws_rds_iam/connection_info/uri.rb
index 8ed5823..b610245 100644
--- a/lib/pg/aws_rds_iam/connection_info/uri.rb
+++ b/lib/pg/aws_rds_iam/connection_info/uri.rb
@@ -5,7 +5,14 @@ module AWS_RDS_IAM
     module ConnectionInfo
       class URI
         def self.match?(connection_string)
-          /\A#{::URI::ABS_URI_REF}\z/.match?(connection_string)
+          regexp =
+            if defined?(::URI::RFC2396_PARSER)
+              ::URI::RFC2396_PARSER.regexp[:ABS_URI_REF]
+            else
+              ::URI::ABS_URI_REF
+            end
+
+          /\A#{regexp}\z/.match?(connection_string)
         end
 
         attr_reader :auth_token_generator_name