diff --git a/.drone.yml b/.drone.yml
index 3ca02296134..5c239555865 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -366,6 +366,7 @@ trigger:
     - docs/**
     - '*.md'
     include:
+    - Makefile
     - pkg/**
     - packaging/**
     - .drone.yml
@@ -462,6 +463,7 @@ trigger:
     - docs/**
     - '*.md'
     include:
+    - Makefile
     - pkg/**
     - packaging/**
     - .drone.yml
@@ -4924,6 +4926,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 959c920d1ce1f36b68e93dd4b4de180dd64ae58c28b9eb52ee1d343f991f5cfd
+hmac: 38be1b6248aae943e74ffd05c822379dc6ce1d1f08f681316d26be7740470a37
 
 ...
diff --git a/Makefile b/Makefile
index 79fd4a84eae..24ad02da4d9 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ include .bingo/Variables.mk
 .PHONY: all deps-go deps-js deps build-go build-backend build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue fix-cue
 
 GO = go
-GO_FILES ?= ./pkg/...
+GO_FILES ?= ./pkg/... ./pkg/apiserver/... ./pkg/apimachinery/...
 SH_FILES ?= $(shell find ./scripts -name *.sh)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS))
@@ -167,7 +167,8 @@ test-go: test-go-unit test-go-integration
 .PHONY: test-go-unit
 test-go-unit: ## Run unit tests for backend with flags.
 	@echo "test backend unit tests"
-	$(GO) test -short -covermode=atomic -timeout=30m ./pkg/...
+	go list -f '{{.Dir}}/...' -m | xargs \
+	$(GO) test -short -covermode=atomic -timeout=30m 
 
 .PHONY: test-go-integration
 test-go-integration: ## Run integration tests for backend with flags.
diff --git a/scripts/drone/events/pr.star b/scripts/drone/events/pr.star
index 08472c20592..fb9f28e4535 100644
--- a/scripts/drone/events/pr.star
+++ b/scripts/drone/events/pr.star
@@ -96,6 +96,7 @@ def pr_pipelines():
         test_backend(
             get_pr_trigger(
                 include_paths = [
+                    "Makefile",
                     "pkg/**",
                     "packaging/**",
                     ".drone.yml",
@@ -112,6 +113,7 @@ def pr_pipelines():
         lint_backend_pipeline(
             get_pr_trigger(
                 include_paths = [
+                    "Makefile",
                     "pkg/**",
                     "packaging/**",
                     ".drone.yml",