diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5c281a5d..3151725d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -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
diff --git a/lib/solidus_dev_support/extension.rb b/lib/solidus_dev_support/extension.rb
index 36f0accf..7d84e53f 100644
--- a/lib/solidus_dev_support/extension.rb
+++ b/lib/solidus_dev_support/extension.rb
@@ -8,6 +8,7 @@
 module SolidusDevSupport
   class Extension < Thor
     include Thor::Actions
+
     PREFIX = "solidus_"
 
     default_command :generate
diff --git a/lib/solidus_dev_support/templates/extension/.github/workflows/test.yml b/lib/solidus_dev_support/templates/extension/.github/workflows/test.yml
index 4579edbb..47db34ae 100644
--- a/lib/solidus_dev_support/templates/extension/.github/workflows/test.yml
+++ b/lib/solidus_dev_support/templates/extension/.github/workflows/test.yml
@@ -7,65 +7,11 @@ on:
   pull_request:
   schedule:
     - cron: "0 0 * * 4" # every Thursday
-
-concurrency:
-  group: test-${{ github.ref_name }}
-  cancel-in-progress: ${{ github.ref_name != 'main' }}
+  workflow_call:
 
 permissions:
   contents: read
 
 jobs:
   rspec:
-    name: Solidus ${{ matrix.solidus-branch }}, Rails ${{ matrix.rails-version }} and Ruby ${{ matrix.ruby-version }} on ${{ matrix.database }}
-    runs-on: ubuntu-24.04
-    strategy:
-      fail-fast: true
-      matrix:
-        rails-version:
-          - "7.0"
-          - "7.1"
-          - "7.2"
-        ruby-version:
-          - "3.1"
-          - "3.4"
-        solidus-branch:
-          - "v4.1"
-          - "v4.2"
-          - "v4.3"
-          - "v4.4"
-          - "v4.5"
-        database:
-          - "postgresql"
-          - "mysql"
-          - "sqlite"
-        exclude:
-          - rails-version: "7.2"
-            solidus-branch: "v4.3"
-          - rails-version: "7.2"
-            solidus-branch: "v4.2"
-          - rails-version: "7.2"
-            solidus-branch: "v4.1"
-          - rails-version: "7.1"
-            solidus-branch: "v4.2"
-          - rails-version: "7.1"
-            solidus-branch: "v4.1"
-          - ruby-version: "3.4"
-            rails-version: "7.0"
-    env:
-      CODECOV_COVERAGE_PATH: ./coverage/coverage.xml
-    steps:
-      - uses: actions/checkout@v4
-      - name: Run extension tests
-        uses: solidusio/test-solidus-extension@main
-        with:
-          database: ${{ matrix.database }}
-          rails-version: ${{ matrix.rails-version }}
-          ruby-version: ${{ matrix.ruby-version }}
-          solidus-branch: ${{ matrix.solidus-branch }}
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v5
-        continue-on-error: true
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ${{ env.CODECOV_COVERAGE_PATH }}
+    uses: solidusio/test-solidus-extension/.github/workflows/test.yml@main