diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
index 877a850d..4e472fc2 100644
--- a/.github/workflows/Tests.yml
+++ b/.github/workflows/Tests.yml
@@ -1,32 +1,58 @@
-name: "Tests"
-
+name: Tests
 on:
-  pull_request:
-    branches:
-      - master
   push:
-    branches:
-      - master
+    branches: [master]
+    tags: ['*']
+  pull_request:
+  workflow_dispatch:
+jobs:
+  test:
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }} ${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch || github.ref != 'refs/tags/v*' }}
+    permissions:
+      actions: write
+      contents: read
+
+    env:
+      JULIA_NUM_THREADS: 'auto'
 
-jobs:
-  tests:
-    name: "Tests"
     strategy:
       fail-fast: false
       matrix:
         version:
-          - "1"
-          - "lts"
-          - "pre"
+          - '1'    # Current stable version
         os:
           - ubuntu-latest
-          - macos-latest
           - windows-latest
-    uses: "SciML/.github/.github/workflows/tests.yml@v1"
-    with:
-      julia-version: "${{ matrix.version }}"
-    secrets: "inherit"
+          - macOS-13
+        arch:
+          - x64
+        include:
+          - os: macOS-latest
+            arch: aarch64
+            version: '1'
+          - os: ubuntu-latest
+            arch: x86
+            version: '1'
+          - os: ubuntu-latest
+            arch: x64
+            version: 'lts'
+          - os: ubuntu-latest
+            arch: x64
+            version: 'pre'
+
+    steps:
+      - uses: actions/checkout@v5
+      - uses: julia-actions/setup-julia@v2
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - uses: julia-actions/cache@v2
+      - uses: julia-actions/julia-buildpkg@v1
+      - uses: julia-actions/julia-runtest@v1
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v5
+        with:
+          files: lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}