diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f0c591f6..8380fc2c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -102,6 +102,7 @@ jobs:
           - { os: ubuntu-24.04, ruby: 2.7, gemfile: gemfiles/public_suffix_3.rb }
           - { os: ubuntu-24.04, ruby: 2.7, gemfile: gemfiles/public_suffix_4.rb }
           - { os: ubuntu-24.04, ruby: 3.1, gemfile: gemfiles/public_suffix_5.rb }
+          - { os: ubuntu-24.04, ruby: 3.1, gemfile: gemfiles/public_suffix_6.rb }
           # Ubuntu
           - { os: ubuntu-22.04, ruby: ruby }
           # macOS
diff --git a/addressable.gemspec b/addressable.gemspec
index bb1f2fa7..105774f6 100644
--- a/addressable.gemspec
+++ b/addressable.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_runtime_dependency(%q<public_suffix>.freeze, [">= 2.0.2".freeze, "< 7.0".freeze])
+  s.add_runtime_dependency(%q<public_suffix>.freeze, [">= 2.0.2".freeze, "< 8.0".freeze])
   s.add_development_dependency(%q<bundler>.freeze, [">= 1.0".freeze, "< 3.0".freeze])
 end
diff --git a/gemfiles/public_suffix_6.rb b/gemfiles/public_suffix_6.rb
new file mode 100644
index 00000000..b0b07bba
--- /dev/null
+++ b/gemfiles/public_suffix_6.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Assumes this gemfile is used from the project root
+eval_gemfile "../Gemfile"
+
+gem "public_suffix", "~> 6.0"
diff --git a/tasks/gem.rake b/tasks/gem.rake
index 70b1f97d..25911593 100644
--- a/tasks/gem.rake
+++ b/tasks/gem.rake
@@ -21,7 +21,7 @@ namespace :gem do
 
     s.required_ruby_version = ">= 2.2"
 
-    s.add_runtime_dependency "public_suffix", ">= 2.0.2", "< 7.0"
+    s.add_runtime_dependency "public_suffix", ">= 2.0.2", "< 8.0"
     s.add_development_dependency "bundler", ">= 1.0", "< 3.0"
 
     s.require_path = "lib"