diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5c68b351..6c693794 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04 ]
-        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
+        ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0', '3.1' ]
         include:
           - os: macos-latest
             ruby: '2.7'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a85b56db..b9f86782 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,8 +10,12 @@ The format is based on [Keep a Changelog], and this project adheres to
 
 ## [Unreleased]
 
+### Added
+
+- Test on Ruby 3.0 and 3.1 in the CI build ([#366]).
 
 [Unreleased]: https://github.com/envato/stack_master/compare/v2.13.2...HEAD
+[#366]: https://github.com/envato/stack_master/pull/366
 
 ## [2.13.2] - 2022-01-25
 
diff --git a/Gemfile b/Gemfile
index 677a9ea3..96049c5f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in stack_master.gemspec
 gemspec
+
+if RUBY_VERSION >= '3.0.0'
+  # SparkleFormation has an issue with Ruby 3 and the SortedSet class.
+  # Remove after merged: https://github.com/sparkleformation/sparkle_formation/pull/271
+  gem 'faux_sorted_set', require: false
+end