diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6951c9432d..a7710f2aa8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
-        gemfile: [Gemfile, gemfiles/rack_2_0.gemfile, gemfiles/rack_3_0.gemfile, gemfiles/rack_3_1.gemfile, gemfiles/rails_6_0.gemfile, gemfiles/rails_6_1.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_7_1.gemfile, gemfiles/rails_7_2.gemfile]
+        gemfile: [Gemfile, gemfiles/rack_2_0.gemfile, gemfiles/rack_3_0.gemfile, gemfiles/rack_3_1.gemfile, gemfiles/rails_6_1.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_7_1.gemfile, gemfiles/rails_7_2.gemfile, gemfiles/rails_8_0.gemfile]
         specs: ['spec --exclude-pattern=spec/integration/**/*_spec.rb']
         include:
           - ruby: '2.7'
@@ -57,11 +57,20 @@ jobs:
           - ruby: '3.3'
             gemfile: gemfiles/rails_7_2.gemfile
             specs: 'spec/integration/rails'
+          - ruby: '3.3'
+            gemfile: gemfiles/rails_8_0.gemfile
+            specs: 'spec/integration/rails'
         exclude:
           - ruby: '2.7'
             gemfile: gemfiles/rails_7_2.gemfile
           - ruby: '3.0'
             gemfile: gemfiles/rails_7_2.gemfile
+          - ruby: '2.7'
+            gemfile: gemfiles/rails_8_0.gemfile
+          - ruby: '3.0'
+            gemfile: gemfiles/rails_8_0.gemfile
+          - ruby: '3.1'
+            gemfile: gemfiles/rails_8_0.gemfile
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d758f3a779..d274b058ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * [#2502](https://github.com/ruby-grape/grape/pull/2502): Remove deprecation `options` in `desc` - [@ericproulx](https://github.com/ericproulx).
 * [#2512](https://github.com/ruby-grape/grape/pull/2512): Optimize hash alloc - [@ericproulx](https://github.com/ericproulx).
 * [#2513](https://github.com/ruby-grape/grape/pull/2513): Optimize Grape::Path - [@ericproulx](https://github.com/ericproulx).
+* [#2514](https://github.com/ruby-grape/grape/pull/2514): Add rails 8.0 to CI - [@ericproulx](https://github.com/ericproulx).
 * Your contribution here.
 
 #### Fixes
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_8_0.gemfile
similarity index 79%
rename from gemfiles/rails_6_0.gemfile
rename to gemfiles/rails_8_0.gemfile
index 0e775d7850..715b61502d 100644
--- a/gemfiles/rails_6_0.gemfile
+++ b/gemfiles/rails_8_0.gemfile
@@ -2,5 +2,5 @@
 
 eval_gemfile '../Gemfile'
 
-gem 'rails', '~> 6.0.0'
+gem 'rails', '~> 8.0'
 gem 'tzinfo-data', require: false