diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index bf3484de340a..0042e9c7302b 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -143,6 +143,8 @@
         usr.bin
             apply
             ..
+            basename
+            ..
             bmake
                 archives
                     fmt_44bsd
diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile
index d647395c83d9..b392c3f378df 100644
--- a/usr.bin/basename/Makefile
+++ b/usr.bin/basename/Makefile
@@ -1,7 +1,13 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	basename
 MLINKS=	basename.1 dirname.1
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/basename/tests/Makefile b/usr.bin/basename/tests/Makefile
new file mode 100644
index 000000000000..32dedabc5f4d
--- /dev/null
+++ b/usr.bin/basename/tests/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/basename
+.PATH: ${TESTSRC}
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin/basename
+ATF_TESTS_SH=	basename_test
+ATF_TESTS_SH_SRC_basename_test=	t_basename.sh
+
+.include <bsd.test.mk>