diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 62d2bf185..2dce8a5a0 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -10,6 +10,10 @@ nav_order: 5
 
 ## main
 
+* Use correct value for the `config.action_dispatch.show_exceptions` config option for edge Rails.
+
+    *Cameron Dutro*
+
 * Remove unsupported versions of Rails & Ruby from CI matrix.
 
     *Reegan Viljoen*
diff --git a/test/sandbox/config/environments/test.rb b/test/sandbox/config/environments/test.rb
index efb583c07..db6092699 100644
--- a/test/sandbox/config/environments/test.rb
+++ b/test/sandbox/config/environments/test.rb
@@ -17,7 +17,7 @@
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
+  config.action_dispatch.show_exceptions = (Rails::VERSION::STRING < "7.1") ? false : :none
 
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection = false