Index: head/usr.sbin/pw/tests/Makefile
===================================================================
--- head/usr.sbin/pw/tests/Makefile	(revision 274010)
+++ head/usr.sbin/pw/tests/Makefile	(revision 274011)
@@ -1,10 +1,21 @@
 # $FreeBSD$
 
+TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.sbin/useradd
+.PATH: ${TESTSRC}
+
 TESTSDIR=	${TESTSBASE}/usr.sbin/pw
 
 ATF_TESTS_SH=	pw_delete pw_modify
 
 FILES=		group helper_functions.shin master.passwd
 FILESDIR=       ${TESTSDIR}
+
+ATF_TESTS_SH+=	pw_test
+# - user{add,del} does not exist on FreeBSD; use pw user{add,del} instead
+# - The command passes on FreeBSD
+ATF_TESTS_SH_SED_pw_test=	-e 's/useradd /pw useradd /'
+ATF_TESTS_SH_SED_pw_test+=	-e 's/userdel /pw userdel /'
+ATF_TESTS_SH_SED_pw_test+=	-e '/atf_expect_fail "PR bin\/39546"/d'
+ATF_TESTS_SH_SRC_pw_test=	t_useradd.sh
 
 .include <bsd.test.mk>