diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 84767f34..c11a60bb 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -147,8 +147,9 @@ jobs:
     continue-on-error: false
     # Job-level ceiling. The go test step below runs with a per-step 10m timeout;
     # this cap catches any step that leaks past that. Set well above 10m so
-    # the per-step timeout is the active constraint.
-    timeout-minutes: 15
+    # the per-step timeout is the active constraint. Raised from 15m to 20m
+    # to account for golangci-lint taking >3m on slow runners (mc#1099).
+    timeout-minutes: 20
     defaults:
       run:
         working-directory: workspace-server
@@ -174,14 +175,14 @@ jobs:
         run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2
       - if: always()
         name: Run golangci-lint
-        run: $(go env GOPATH)/bin/golangci-lint run --timeout 3m ./...
-      - if: always()
-        name: Diagnostic — per-package verbose 60s
+        run: $(go env GOPATH)/bin/golangci-lint run --no-config --timeout 10m ./...
+      - if: success()
+        name: Diagnostic — per-package verbose 600s
         run: |
           set +e
-          go test -race -v -timeout 60s ./internal/handlers/... 2>&1 | tee /tmp/test-handlers.log
+          go test -race -v -timeout 600s ./internal/handlers/... 2>&1 | tee /tmp/test-handlers.log
           handlers_exit=$?
-          go test -race -v -timeout 60s ./internal/pendinguploads/... 2>&1 | tee /tmp/test-pu.log
+          go test -race -v -timeout 600s ./internal/pendinguploads/... 2>&1 | tee /tmp/test-pu.log
           pu_exit=$?
           echo "::group::handlers exit=$handlers_exit (last 100 lines)"
           tail -100 /tmp/test-handlers.log
diff --git a/workspace-server/internal/handlers/org_helpers_pure_test.go b/workspace-server/internal/handlers/org_helpers_pure_test.go
index 34296abd..9d96e899 100644
--- a/workspace-server/internal/handlers/org_helpers_pure_test.go
+++ b/workspace-server/internal/handlers/org_helpers_pure_test.go
@@ -287,7 +287,7 @@ func TestRenderCategoryRoutingYAML_StableOrdering(t *testing.T) {
 	if ai <= 0 || zi <= 0 || mi <= 0 {
 		t.Fatalf("could not locate all keys in output: %s", out)
 	}
-	if !(ai < mi && mi < zi) {
+	if !(ai < mi) || !(mi < zi) {
 		t.Errorf("keys not sorted: alpha=%d middle=%d zebra=%d, output:\n%s", ai, mi, zi, out)
 	}
 }