diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 5c2aff1a7..e84772686 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -29,8 +29,40 @@ jobs:
       - name: Test source headers are present
         run: make test-source-headers
       - name: Run unit tests
-        run: make test-coverage
-        env:
-          TESTFLAGS: "-count=2 -shuffle=on"
+        run: make test-coverage TESTCOUNT=2
+      - name: Test build
+        run: make build
+name: build-test
+on:
+  push:
+    branches:
+      - "main"
+      - "dev-v3"
+      - "release-**"
+  pull_request:
+    branches:
+      - "main"
+      - "dev-v3"
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2
+      - name: Add variables to environment file
+        run: cat ".github/env" >> "$GITHUB_ENV"
+      - name: Setup Go
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0
+        with:
+          go-version: '${{ env.GOLANG_VERSION }}'
+          check-latest: true
+      - name: Test source headers are present
+        run: make test-source-headers
+      - name: Run unit tests
+        run: make test-coverage TESTCOUNT=2
       - name: Test build
         run: make build