diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4b408e518..c803379ce 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,18 +10,22 @@ jobs:
       matrix:
         entry:
           # Ensure that all host can install toolchain, build project, and run tests
-          - { os: macos-10.15,  toolchain: wasm-5.7.3-RELEASE, wasi-backend: Node, xcode: Xcode_12.4.app }
-          - { os: macos-11,     toolchain: wasm-5.7.3-RELEASE, wasi-backend: Node, xcode: Xcode_13.2.1.app }
-          - { os: macos-12,     toolchain: wasm-5.7.3-RELEASE, wasi-backend: Node, xcode: Xcode_13.4.1.app }
+          - { os: macos-11,     toolchain: wasm-5.8.0-RELEASE, wasi-backend: Node, xcode: Xcode_13.2.1.app }
+          - { os: macos-12,     toolchain: wasm-5.8.0-RELEASE, wasi-backend: Node, xcode: Xcode_13.4.1.app }
+          - { os: macos-13,     toolchain: wasm-5.8.0-RELEASE, wasi-backend: Node, xcode: Xcode_14.3.app }
+          - { os: ubuntu-22.04, toolchain: wasm-5.8.0-RELEASE, wasi-backend: Node }
 
           # Ensure that test succeeds with all toolchains and wasi backend combinations
           - { os: ubuntu-20.04, toolchain: wasm-5.5.0-RELEASE, wasi-backend: Node }
           - { os: ubuntu-20.04, toolchain: wasm-5.6.0-RELEASE, wasi-backend: Node }
           - { os: ubuntu-20.04, toolchain: wasm-5.7.3-RELEASE, wasi-backend: Node }
+          - { os: ubuntu-20.04, toolchain: wasm-5.8.0-RELEASE, wasi-backend: Node }
           - { os: ubuntu-20.04, toolchain: wasm-5.6.0-RELEASE, wasi-backend: Wasmer }
           - { os: ubuntu-20.04, toolchain: wasm-5.7.3-RELEASE, wasi-backend: Wasmer }
+          - { os: ubuntu-20.04, toolchain: wasm-5.8.0-RELEASE, wasi-backend: Wasmer }
           - { os: ubuntu-20.04, toolchain: wasm-5.6.0-RELEASE, wasi-backend: MicroWASI }
           - { os: ubuntu-20.04, toolchain: wasm-5.7.3-RELEASE, wasi-backend: MicroWASI }
+          - { os: ubuntu-20.04, toolchain: wasm-5.8.0-RELEASE, wasi-backend: MicroWASI }
 
     runs-on: ${{ matrix.entry.os }}
     env:
@@ -53,14 +57,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-10.15
-            xcode: Xcode_12.4
           - os: macos-11
             xcode: Xcode_13.2.1
           - os: macos-12
             xcode: Xcode_13.3
           - os: macos-12
             xcode: Xcode_14.0
+          - os: macos-13
+            xcode: Xcode_14.3
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2