diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb93abe..018d2a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,11 +5,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.0', '3.1', '3.2']
+        ruby: ['3.0', '3.1', '3.2', '3.3']
         gemfile:
           - activemodel_6_1
           - activemodel_7_0
           - activemodel_7_1
+          - activemodel_7_2
+          - activemodel_8_0
+        exclude:
+          # Rails 7.2 requires Ruby >= 3.1.0
+          - ruby: '3.0'
+            gemfile: 'activemodel_7_2'
+          # Rails 8.0 requires Ruby >= 3.2.0
+          - ruby: '3.0'
+            gemfile: 'activemodel_8_0'
+          - ruby: '3.1'
+            gemfile: 'activemodel_8_0'
     name: Ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
     runs-on: ubuntu-latest
     env:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4177244..b3db45c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.9.5
+
+* Rails 8.0 support
+
 ## 0.9.4
 
 * Test release
diff --git a/Gemfile b/Gemfile
index 1a239df..57530f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem "activemodel", "~> 7.1"
+  gem "activemodel", "~> 8.0.0"
   gem "rspec", "~> 3.12"
   gem "bump", "~> 0.10.0"
 end
diff --git a/README.md b/README.md
index d226b97..8684afd 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ end
 
 ## Dependencies
 
-* Active Model (6, 7)
+* Active Model (6, 7, 8)
 * RSpec (3)
 
 ## Installation
diff --git a/accept_values_for.gemspec b/accept_values_for.gemspec
index a1c8f62..519047d 100644
--- a/accept_values_for.gemspec
+++ b/accept_values_for.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
 
-  spec.add_dependency "activemodel", ">= 6.1", "< 8.0"
+  spec.add_dependency "activemodel", ">= 6.1", "< 8.1"
   spec.add_dependency "rspec", ">= 3.10", "< 4.0"
 
   spec.add_development_dependency "bundler", "~> 2.2"
diff --git a/gemfiles/activemodel_7_2.gemfile b/gemfiles/activemodel_7_2.gemfile
new file mode 100644
index 0000000..6e0729a
--- /dev/null
+++ b/gemfiles/activemodel_7_2.gemfile
@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "activemodel", "~> 7.2.0"
+
+group :test do
+  gem "activerecord", "~> 7.2.0", require: "active_record"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3", "~> 1.6"
+end
diff --git a/gemfiles/activemodel_8_0.gemfile b/gemfiles/activemodel_8_0.gemfile
new file mode 100644
index 0000000..f496578
--- /dev/null
+++ b/gemfiles/activemodel_8_0.gemfile
@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "activemodel", "~> 8.0.0"
+
+group :test do
+  gem "activerecord", "~> 8.0.0", require: "active_record"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3", "~> 2.2"
+end