Index: contrib/netbsd-tests/lib/libc/c063/t_faccessat.c
===================================================================
--- contrib/netbsd-tests/lib/libc/c063/t_faccessat.c
+++ contrib/netbsd-tests/lib/libc/c063/t_faccessat.c
@@ -165,6 +165,9 @@
 	ATF_REQUIRE(faccessat(dfd, BASELINK, F_OK, 0) == -1);
 	ATF_REQUIRE(errno == ENOENT);
 
+#ifdef __FreeBSD__
+	atf_tc_expect_fail("Depends on non-standard behavior not mentioned in POSIX.1-2008");
+#endif
 	ATF_REQUIRE(faccessat(dfd, BASELINK, F_OK, AT_SYMLINK_NOFOLLOW) == 0);
 
 	ATF_REQUIRE(close(dfd) == 0);
Index: contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c
===================================================================
--- contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c
+++ contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c
@@ -40,6 +40,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
 
 #define DIR "dir"
 #define FILE "dir/fchmodat"
Index: contrib/netbsd-tests/lib/libc/c063/t_fchownat.c
===================================================================
--- contrib/netbsd-tests/lib/libc/c063/t_fchownat.c
+++ contrib/netbsd-tests/lib/libc/c063/t_fchownat.c
@@ -41,6 +41,9 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/param.h>
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
 
 #define DIR "dir"
 #define FILE "dir/fchownat"
Index: contrib/netbsd-tests/lib/libc/c063/t_fstatat.c
===================================================================
--- contrib/netbsd-tests/lib/libc/c063/t_fstatat.c
+++ contrib/netbsd-tests/lib/libc/c063/t_fstatat.c
@@ -40,6 +40,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
 
 #define DIR "dir"
 #define FILE "dir/fstatat"
Index: lib/libc/tests/c063/Makefile
===================================================================
--- lib/libc/tests/c063/Makefile
+++ lib/libc/tests/c063/Makefile
@@ -4,21 +4,23 @@
 
 #TODO: t_o_search, t_utimensat
 
-NETBSD_ATF_TESTS_C=	t_faccessat
-NETBSD_ATF_TESTS_C+=	t_fchmodat
-NETBSD_ATF_TESTS_C+=	t_fchownat
-NETBSD_ATF_TESTS_C+=	t_fexecve
-NETBSD_ATF_TESTS_C+=	t_fstatat
-NETBSD_ATF_TESTS_C+=	t_linkat
-NETBSD_ATF_TESTS_C+=	t_mkdirat
-NETBSD_ATF_TESTS_C+=	t_mkfifoat
-NETBSD_ATF_TESTS_C+=	t_mknodat
-NETBSD_ATF_TESTS_C+=	t_openat
-NETBSD_ATF_TESTS_C+=	t_readlinkat
-NETBSD_ATF_TESTS_C+=	t_renameat
-NETBSD_ATF_TESTS_C+=	t_symlinkat
-NETBSD_ATF_TESTS_C+=	t_unlinkat
+NETBSD_ATF_TESTS_C=	faccessat
+NETBSD_ATF_TESTS_C+=	fchmodat
+NETBSD_ATF_TESTS_C+=	fchownat
+NETBSD_ATF_TESTS_C+=	fexecve
+NETBSD_ATF_TESTS_C+=	fstatat
+NETBSD_ATF_TESTS_C+=	linkat
+NETBSD_ATF_TESTS_C+=	mkdirat
+NETBSD_ATF_TESTS_C+=	mkfifoat
+NETBSD_ATF_TESTS_C+=	mknodat
+NETBSD_ATF_TESTS_C+=	openat
+NETBSD_ATF_TESTS_C+=	readlinkat
+NETBSD_ATF_TESTS_C+=	renameat
+NETBSD_ATF_TESTS_C+=	symlinkat
+NETBSD_ATF_TESTS_C+=	unlinkat
 
 CFLAGS+= -D_INCOMPLETE_XOPEN_C063
 
+.include "../Makefile.netbsd-tests"
+
 .include <bsd.test.mk>