diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fe6ce2ca2..d848f2dd0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -71,12 +71,6 @@ jobs:
           restore-keys: |
             ${{ matrix.config.platform }}-${{ matrix.config.arch }}-yarn-
           enableCrossOsArchive: true
-      - name: "[preparation] execute client test"
-        run: |
-          make client-deps && make test-client
-      - name: "[preparation] execute server test"
-        run: |
-          make test-server
       - name: "[preparation] set up qemu"
         uses: docker/setup-qemu-action@v2
       - name: "[preparation] set up docker context for buildx"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index a0830c33c..ec853f701 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -15,6 +15,13 @@ jobs:
       - name: Run tests
         run: make test-client ARGS="--maxWorkers=2"
   test-server:
+    strategy:
+      matrix:
+        config:
+          - { platform: linux, arch: amd64 }
+          - { platform: linux, arch: arm64 }
+          - { platform: windows, arch: amd64, version: 1809 }
+          - { platform: windows, arch: amd64, version: ltsc2022 }
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3