diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index e96e03f..c1c752d 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -13,36 +13,17 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - "1.0"  # LTS
-          - "1"    # Latest Release
+          - "lts"
+          - "1"  # Latest Release
         os:
           - ubuntu-latest
-          - macOS-latest
+          - macOS-latest  # Apple silicon
           - windows-latest
-        arch:
-          - x86
-          - x64
-        exclude:
-          # 32-bit Julia binaries are not available on macOS
-          - os: macOS-latest
-            arch: x86
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
-          arch: ${{ matrix.arch }}
-      - uses: actions/cache@v2
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-${{ matrix.arch }}-test-
-            ${{ runner.os }}-${{ matrix.arch }}-
-            ${{ runner.os }}-
+      - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
-
diff --git a/.github/workflows/Documenter.yml b/.github/workflows/Documenter.yml
index 8235e51..e2a15d5 100644
--- a/.github/workflows/Documenter.yml
+++ b/.github/workflows/Documenter.yml
@@ -10,11 +10,11 @@ jobs:
     name: Documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
-          version: '1.6'
-      - uses: julia-actions/julia-docdeploy@latest
+          version: '1.10'
+      - uses: julia-actions/julia-docdeploy@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
diff --git a/.github/workflows/JuliaNightly.yml b/.github/workflows/JuliaNightly.yml
index 951a1a2..d380a66 100644
--- a/.github/workflows/JuliaNightly.yml
+++ b/.github/workflows/JuliaNightly.yml
@@ -7,27 +7,22 @@ on:
     branches: [master]
     tags: ["*"]
   pull_request:
+
 jobs:
   test:
     name: Julia Nightly - Ubuntu - x64
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
           version: nightly
-          arch: x64
-      - uses: actions/cache@v2
-        env:
-          cache-name: julia-nightly-cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ env.cache-name }}-
-      - uses: julia-actions/julia-buildpkg@latest
-      - uses: julia-actions/julia-runtest@latest
+      - 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@v1
+      - uses: codecov/codecov-action@v5
+        continue-on-error: true
         with:
+          token: ${{ secrets.CODECOV_TOKEN }} # required
           file: lcov.info
diff --git a/.github/workflows/fix_doctests.yml b/.github/workflows/fix_doctests.yml
index 5ca114d..d29c51b 100644
--- a/.github/workflows/fix_doctests.yml
+++ b/.github/workflows/fix_doctests.yml
@@ -7,12 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        julia-version: [1.6]
+        julia-version: '1.10'
     steps:
+      - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@latest
         with:
           version: ${{ matrix.julia-version }}
-      - uses: actions/checkout@v1
       - name: Fix doctests
         shell: julia --project=docs/ {0}
         run: |
diff --git a/src/output_control.jl b/src/output_control.jl
index d9eba57..c1eb5b3 100644
--- a/src/output_control.jl
+++ b/src/output_control.jl
@@ -1,6 +1,12 @@
 # Test.get_test_result generates code that uses the following so we must import them
 using Test: Returned, Threw, eval_test
 
+@static if VERSION >= v"1.13.0-DEV.300"
+    # https://github.com/JuliaLang/julia/commit/d934b032ea5bf63b353371ad285605128c735873
+    # used by `Test.do_test` in `macro test_msg`
+    using Test: eval_test_comparison, eval_test_function
+end
+
 "A cunning hack to carry extra message along with the original expression in a test"
 struct ExprAndMsg
     ex