diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index e3cd483..050640a 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -1,4 +1,4 @@
-name: Build
+name: Test and build
 on:
   push:
 
@@ -6,7 +6,23 @@ permissions:
   contents: read
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go }}
+      #- name: golangci-lint
+      #  uses: golangci/golangci-lint-action@v9
+      #  with:
+      #    go-version: ${{ matrix.go }}
+      #    version: v2.6
+
   build:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
@@ -23,7 +39,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
       - name: Setup Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           go-version: stable
       - name: Set target variables
@@ -37,9 +53,9 @@ jobs:
         run:  go mod download
       - name: Make build directory
         run:  mkdir -p build
-      - name: Build hamview-collector (${{ matrix.goos}} ${{ matrix.goarch }}${{ matrix.goarm }})
+      - name: Build hamview-collector
         run:  go build -o build/hamview-collector.${{ matrix.goarch }}${{ matrix.goarm }} -v ./cmd/hamview-collector
-      - name: Build hamview-receiver (${{ matrix.goos}} ${{ matrix.goarch }}${{ matrix.goarm }})
+      - name: Build hamview-receiver
         run:  go build -o build/hamview-receiver.${{ matrix.goarch }}${{ matrix.goarm }} -v ./cmd/hamview-receiver
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
deleted file mode 100644
index b8ad33e..0000000
--- a/.gitea/workflows/test.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Run tests
-on:
-  push:
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-      - name: Setup Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: ${{ matrix.go }}
-      #- name: golangci-lint
-      #  uses: golangci/golangci-lint-action@v9
-      #  with:
-      #    go-version: ${{ matrix.go }}
-      #    version: v2.6