diff --git a/.github/workflows/build-test-macos-arm64.yml b/.github/workflows/build-test-macos-arm64.yml
deleted file mode 100644
index d79262da7..000000000
--- a/.github/workflows/build-test-macos-arm64.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Build and run tests (MacOS ARM64)
-
-on:
-  push:
-    branches: [master, rc/*, feat/*]
-  pull_request:
-    branches: [master, feat/*, rc/*]
-  workflow_dispatch:
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        go-version: [1.20.7]
-    runs-on: macos-13-xlarge
-    steps:
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.go-version }}
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Test
-        run: |
-          make test-w2
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 3fa80144a..a48c83897 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -21,6 +21,14 @@ jobs:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
       uses: actions/checkout@v2
-    - name: Test
-      run: |
-          make test
+
+    - name: Test (Linux)
+      if: runner.os == 'Linux'
+      run: | 
+        make test
+
+    - name: Test (MacOS ARM64)
+      if: runner.os == 'macOS'
+      run: | 
+        make test-w2
+