diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 7baade1aa..83193a5fc 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -4,6 +4,7 @@ on:
     types: [opened, edited, synchronize, reopened]
     branches:
       - main
+      - master
 
 permissions:
   # Required: allow read access to the content for analysis.
@@ -21,7 +22,6 @@ jobs:
       matrix:
         working-directory:
           - ""
-          - tools/setup-envtest
     steps:
       - name: Set up Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # tag=v5.0.0
diff --git a/.github/workflows/tools-releases.yml b/.github/workflows/tools-releases.yml
index 9b411698f..b4dda9f82 100644
--- a/.github/workflows/tools-releases.yml
+++ b/.github/workflows/tools-releases.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - master
     paths:
       - 'hack/envtest/_matrix/*.yaml'