diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index d9973872826706..bfe0405ac9f546 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -165,7 +165,7 @@ jobs:
             rspec-persistence-main
             rspec-persistence
 
-      - run: bin/rspec
+      - run: bin/flatware rspec -r ./spec/flatware_helper.rb
 
       - name: Upload coverage reports to Codecov
         if: matrix.ruby-version == '.ruby-version'
diff --git a/lib/mastodon/redis_configuration.rb b/lib/mastodon/redis_configuration.rb
index 4cc3e8ccde9667..3cdfd8262a882d 100644
--- a/lib/mastodon/redis_configuration.rb
+++ b/lib/mastodon/redis_configuration.rb
@@ -43,6 +43,8 @@ def setup_config(prefix: nil, defaults: {})
     port     = ENV.fetch("#{prefix}PORT", defaults[:port])
     db       = ENV.fetch("#{prefix}DB", defaults[:db])
 
+    db = ENV.fetch('TEST_ENV_NUMBER', nil) if Rails.env.test?
+
     return { url:, driver: } if url
 
     sentinel_options = setup_sentinels(prefix, default_user: user, default_password: password)