diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 00b9fc817bfd..770b512faa82 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.343 2015/06/18 22:29:12 pooka Exp $
+#	$NetBSD: bsd.README,v 1.344 2015/06/19 18:13:52 matt Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -136,6 +136,10 @@ MKCATPAGES	If "no", don't build or install the catman pages.
 MKCOMPAT  	If "no", don't build or install the src/compat.
 		Default: yes on amd64/mips64/sparc64, no elsewhere.
 
+MKCOMPATTESTS  	If "yes", build and install the NetBSD test suite when
+		building and installing src/compat.
+		Default: no
+
 MKCOMPLEX	If "no", don't build libm support for <complex.h>
 		Default: yes
 
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 1b15f6f01168..e5c317ba18e0 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.854 2015/06/18 22:29:12 pooka Exp $
+#	$NetBSD: bsd.own.mk,v 1.855 2015/06/19 18:13:52 matt Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1004,7 +1004,7 @@ MKKMOD=		no
 #
 _MKVARS.no= \
 	MKBSDGREP MKBSDTAR \
-	MKCATPAGES MKCRYPTO_RC5 MKCTF MKDEBUG \
+	MKCATPAGES MKCOMPATTESTS MKCRYPTO_RC5 MKCTF MKDEBUG \
 	MKDEBUGLIB MKDTRACE MKEXTSRC MKGROFFHTMLDOC \
 	MKKYUA MKLLD MKLLDB MKLINT \
 	MKMANZ MKMCLINKER MKOBJDIRS \
@@ -1428,6 +1428,6 @@ _MKTARGET_YACC?=	${_MKMSG_YACC} ${.CURDIR:T}/${.TARGET}
 TARGETS+=	lintmanpages
 .endif
 
-TESTSBASE=	/usr/tests
+TESTSBASE=	/usr/tests${MLIBDIR:D/${MLIBDIR}}
 
 .endif	# !defined(_BSD_OWN_MK_)