diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
index 9903b25b701..c4a1f90b173 100644
--- a/lib/csu/Makefile.inc
+++ b/lib/csu/Makefile.inc
@@ -1,4 +1,4 @@
-PACKAGE=	clibs-dev
+PACKAGE?=	clibs-dev
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 # Can't instrument these files since that breaks non-sanitized programs.
diff --git a/lib/csu/tests/Makefile b/lib/csu/tests/Makefile
index 946d293973d..c9a0e6eff5d 100644
--- a/lib/csu/tests/Makefile
+++ b/lib/csu/tests/Makefile
@@ -1,3 +1,5 @@
+PACKAGE=	tests
+
 SUBDIR=		dso
 TESTS_SUBDIRS=	dynamic
 TESTS_SUBDIRS+=	dynamiclib
diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc
index ea77a5f420d..ed0d6c46bd6 100644
--- a/lib/libbsnmp/Makefile.inc
+++ b/lib/libbsnmp/Makefile.inc
@@ -1,4 +1,4 @@
 INCSDIR=	${INCLUDEDIR}/bsnmp
-PACKAGE=	bsnmp
+PACKAGE?=	bsnmp
 
 .include "../Makefile.inc"
diff --git a/lib/libbsnmp/tests/Makefile b/lib/libbsnmp/tests/Makefile
index fdd5484ec07..7a4a17e893a 100644
--- a/lib/libbsnmp/tests/Makefile
+++ b/lib/libbsnmp/tests/Makefile
@@ -1,5 +1,7 @@
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+
 ATF_TESTS_C+=	bsnmpd_test
 
 SRCS.bsmpd_test=	bsnmpd_test.c
diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc
index 8998b613dda..e5e48d7a9b3 100644
--- a/secure/libexec/Makefile.inc
+++ b/secure/libexec/Makefile.inc
@@ -1,4 +1,4 @@
 BINDIR?=	/usr/libexec
-PACKAGE=	ssh
+PACKAGE?=	ssh
 
 .include "../Makefile.inc"
diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile
index 29b1b564bec..e142d9c1e98 100644
--- a/secure/libexec/tests/Makefile
+++ b/secure/libexec/tests/Makefile
@@ -1,4 +1,5 @@
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
+PACKAGE=	tests
 
 .include <bsd.test.mk>