diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1842dce3..49c3ee63 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,21 +8,35 @@ jobs:
     strategy:
       matrix:
         ruby_version: ['2.7', '3.0', '3.1', '3.2']
-        rails_gemfile: ['6.0', '6.1', '7.0', '7.1', '7.2']
+        rails_gemfile: ['6.0', '6.1', '7.0', '7.1', '7.2', '8.0', '8.1']
         postgres_version: ['14']
         include:
         # Postgres versions
-        - { ruby_version: '3.2', rails_gemfile: '7.2', postgres_version: '9' }
-        - { ruby_version: '3.2', rails_gemfile: '7.2', postgres_version: '10' }
-        - { ruby_version: '3.2', rails_gemfile: '7.2', postgres_version: '11' }
-        - { ruby_version: '3.2', rails_gemfile: '7.2', postgres_version: '12' }
-        - { ruby_version: '3.2', rails_gemfile: '7.2', postgres_version: '13' }
-        - { ruby_version: '3.2', rails_gemfile: '7.2', postgres_version: '14' }
-        exclude: # Rails 7.2 is not compatible with Ruby < 3.1
+        - { ruby_version: '3.2', rails_gemfile: '8.1', postgres_version: '9' }
+        - { ruby_version: '3.2', rails_gemfile: '8.1', postgres_version: '10' }
+        - { ruby_version: '3.2', rails_gemfile: '8.1', postgres_version: '11' }
+        - { ruby_version: '3.2', rails_gemfile: '8.1', postgres_version: '12' }
+        - { ruby_version: '3.2', rails_gemfile: '8.1', postgres_version: '13' }
+        - { ruby_version: '3.2', rails_gemfile: '8.1', postgres_version: '14' }
+        exclude: 
+          # Rails 7.2 is not compatible with Ruby < 3.1
+          # Rails 8.0 is not compatible with Ruby < 3.2
         - ruby_version: '2.7'
           rails_gemfile: '7.2'
+        - ruby_version: '2.7'
+          rails_gemfile: '8.0'
+        - ruby_version: '2.7'
+          rails_gemfile: '8.1'
         - ruby_version: '3.0'
           rails_gemfile: '7.2'
+        - ruby_version: '3.0'
+          rails_gemfile: '8.0'
+        - ruby_version: '3.0'
+          rails_gemfile: '8.1'
+        - ruby_version: '3.1'
+          rails_gemfile: '8.0'
+        - ruby_version: '3.1'
+          rails_gemfile: '8.1'
     name: "Test: Ruby ${{ matrix.ruby_version }}, Rails ${{ matrix.rails_gemfile }}, PostgreSQL ${{ matrix.postgres_version }}"
     services:
       db:
diff --git a/spec/gemfiles/Gemfile-rails-8.0 b/spec/gemfiles/Gemfile-rails-8.0
new file mode 100644
index 00000000..b53a1238
--- /dev/null
+++ b/spec/gemfiles/Gemfile-rails-8.0
@@ -0,0 +1,23 @@
+source 'https://rubygems.org'
+
+gem 'que', path: '../..'
+
+group :development, :test do
+  gem 'rake'
+
+  gem 'activerecord',    '~> 8.0.0', require: nil
+  gem 'activejob',       '~> 8.0.0', require: nil
+  gem 'sequel',          require: nil
+  gem 'connection_pool', require: nil
+  gem 'pond',            require: nil
+  gem 'pg',              require: nil, platform: :ruby
+  gem 'pg_jruby',        require: nil, platform: :jruby
+end
+
+group :test do
+  gem 'minitest',         '~> 5.10.1'
+  gem 'minitest-profile', '0.0.2'
+  gem 'minitest-hooks',   '1.4.0'
+  gem 'pry'
+  gem 'pg_examiner', '~> 0.5.2'
+end
diff --git a/spec/gemfiles/Gemfile-rails-8.1 b/spec/gemfiles/Gemfile-rails-8.1
new file mode 100644
index 00000000..3068aa3f
--- /dev/null
+++ b/spec/gemfiles/Gemfile-rails-8.1
@@ -0,0 +1,23 @@
+source 'https://rubygems.org'
+
+gem 'que', path: '../..'
+
+group :development, :test do
+  gem 'rake'
+
+  gem 'activerecord',    '~> 8.1.0', require: nil
+  gem 'activejob',       '~> 8.1.0', require: nil
+  gem 'sequel',          require: nil
+  gem 'connection_pool', require: nil
+  gem 'pond',            require: nil
+  gem 'pg',              require: nil, platform: :ruby
+  gem 'pg_jruby',        require: nil, platform: :jruby
+end
+
+group :test do
+  gem 'minitest',         '~> 5.10.1'
+  gem 'minitest-profile', '0.0.2'
+  gem 'minitest-hooks',   '1.4.0'
+  gem 'pry'
+  gem 'pg_examiner', '~> 0.5.2'
+end