diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5c281a5d..c59cfca1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,10 +7,10 @@ on:
   pull_request:
   schedule:
     - cron: "0 0 * * 4" # every Thursday
+  workflow_call:
 
 concurrency:
   group: test-${{ github.ref_name }}
-  cancel-in-progress: ${{ github.ref_name != 'main' }}
 
 permissions:
   contents: read
@@ -39,6 +39,8 @@ jobs:
           - "mysql"
           - "sqlite"
         exclude:
+          - solidus-branch: "main"
+            ruby-version: "3.1"
           - rails-version: "7.2"
             solidus-branch: "v4.3"
           - ruby-version: "3.1"
@@ -47,6 +49,29 @@ jobs:
             rails-version: "8.0"
           - solidus-branch: "v4.4"
             rails-version: "8.0"
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+        options: >-
+          --health-cmd="pg_isready"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+        ports:
+          - 5432:5432
+      mysql:
+        image: mysql:8
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+        ports:
+          - 3306:3306
     steps:
       - uses: actions/checkout@v4
       - name: Run extension tests