diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6824190..eb690e9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,12 +83,17 @@ jobs:
         with:
           bundler-cache: true
 
+      - name: Set up database
+        env:
+          RAILS_ENV: test
+        run: bin/rails db:create db:structure:load
+
       - name: Run tests
         env:
           RAILS_ENV: test
           # RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
           # REDIS_URL: redis://localhost:6379/0
-        run: bin/rails db:test:prepare test
+        run: bin/rails test
 
   system-test:
     runs-on: ubuntu-latest
@@ -108,12 +113,17 @@ jobs:
         with:
           bundler-cache: true
 
+      - name: Set up database
+        env:
+          RAILS_ENV: test
+        run: bin/rails db:create db:structure:load
+
       - name: Run System Tests
         env:
           RAILS_ENV: test
           # RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
           # REDIS_URL: redis://localhost:6379/0
-        run: bin/rails db:test:prepare test:system
+        run: bin/rails test:system
 
       - name: Keep screenshots from failed system tests
         uses: actions/upload-artifact@v4