diff --git a/.github/workflows/engines.yml b/.github/workflows/engines.yml
index 0f01dc4..ceadc56 100644
--- a/.github/workflows/engines.yml
+++ b/.github/workflows/engines.yml
@@ -17,7 +17,6 @@ jobs:
           - gemfiles/active_model_6.1.gemfile
           - gemfiles/active_model_7.0.gemfile
           - gemfiles/active_model_7.1.gemfile
-          - gemfiles/active_model_edge.gemfile
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfiles }}
     steps:
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 60647fb..8123b55 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -20,7 +20,7 @@ jobs:
           - gemfiles/active_model_edge.gemfile
         exclude:
           - ruby-version: '3.0'
-            gemfiles: gemfiles/active_model_7.1.gemfile
+            gemfiles: gemfiles/active_model_edge.gemfile
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfiles }}
     steps:
@@ -29,7 +29,6 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-        gemfile: ${{ matrix.gemfiles }}
         bundler-cache: true
     - name: Run tests
       run: bundle exec rake
diff --git a/test/test_helper.rb b/test/test_helper.rb
index b967814..9baec68 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,7 +10,7 @@
 Minitest::Reporters.use! [Minitest::Reporters::ProgressReporter.new]
 I18n.enforce_available_locales = true
 
-class BaseTestCase < MiniTest::Test
+class BaseTestCase < ActiveSupport::TestCase
   protected
   # Creates a new ActiveModel model (and the associated table)
   def new_model(&block)