diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f04ef73..4fb6126e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
       fail-fast: false
       matrix:
         # https://www.cockroachlabs.com/docs/releases/release-support-policy
-        crdb: [v23.2, v24.1, v24.3, v25.1]
+        crdb: [v24.1, v24.3, v25.1, v25.2]
         ruby: ["3.4"]
     name: Test (crdb=${{ matrix.crdb }} ruby=${{ matrix.ruby }})
     steps:
diff --git a/test/cases/fixtures_test.rb b/test/cases/fixtures_test.rb
index faa5ca3c..86c44d62 100644
--- a/test/cases/fixtures_test.rb
+++ b/test/cases/fixtures_test.rb
@@ -43,10 +43,14 @@ def before_setup
         parrots_pirates_redefine
         parrots_treasures_redefine
       end
+    ensure
+      super
     end
 
     def teardown
       Arel::Table.engine = ActiveRecord::Base
+    ensure
+      super
     end
 
     # This replaces the same test that's been excluded from