diff --git a/contrib/netbsd-tests/lib/libc/gen/t_cpuset.c b/contrib/netbsd-tests/lib/libc/gen/t_cpuset.c
index 9eca03bae2b0..56ab7364af2a 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_cpuset.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_cpuset.c
@@ -1,114 +1,154 @@
 /*	$NetBSD: t_cpuset.c,v 1.1 2011/11/08 05:47:00 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jukka Ruohonen.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: t_cpuset.c,v 1.1 2011/11/08 05:47:00 jruoho Exp $");
 
 #include <atf-c.h>
 #include <limits.h>
 #include <stdio.h>
 #include <sched.h>
 
+#ifdef __FreeBSD__
+#include <sys/cpuset.h>
+
+#include <stdlib.h>
+
+#define	cpuset_create()		calloc(1, sizeof(cpuset_t))
+#define	cpuset_destroy(cs)	free(cs)
+
+static inline int
+cpuset_set(size_t i, cpuset_t *cs)
+{
+
+	if (i > CPU_SETSIZE)
+		return (-1);
+	CPU_SET(i, cs);
+	return (0);
+}
+
+static inline int
+cpuset_clr(size_t i, cpuset_t *cs)
+{
+
+	if (i > CPU_SETSIZE)
+		return (-1);
+	CPU_CLR(i, cs);
+	return (0);
+}
+
+static inline int
+cpuset_isset(size_t i, cpuset_t *cs)
+{
+
+	if (i > CPU_SETSIZE)
+		return (-1);
+	return (CPU_ISSET(i, cs));
+}
+
+#define	cpuset_size(cs)		sizeof(*cs)
+#endif
+
 ATF_TC(cpuset_err);
 ATF_TC_HEAD(cpuset_err, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Test errors from cpuset(3)");
 }
 
 ATF_TC_BODY(cpuset_err, tc)
 {
 	cpuset_t *set;
 
 	set = cpuset_create();
 	ATF_REQUIRE(set != NULL);
 
 	ATF_CHECK(cpuset_set(-1, set) == -1);
 	ATF_CHECK(cpuset_clr(-1, set) == -1);
 	ATF_CHECK(cpuset_isset(-1, set) == -1);
 
 	ATF_CHECK(cpuset_set(INT_MAX, set) == -1);
 	ATF_CHECK(cpuset_clr(INT_MAX, set) == -1);
 	ATF_CHECK(cpuset_isset(INT_MAX, set) == -1);
 
 	cpuset_destroy(set);
 }
 
 ATF_TC(cpuset_set);
 ATF_TC_HEAD(cpuset_set, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Test cpuset_set(3)");
 }
 
 ATF_TC_BODY(cpuset_set, tc)
 {
 	cpuset_t *set;
 
 	set = cpuset_create();
 	ATF_REQUIRE(set != NULL);
 
 	ATF_REQUIRE(cpuset_set(0, set) == 0);
 	ATF_REQUIRE(cpuset_isset(0, set) > 0);
 	ATF_REQUIRE(cpuset_clr(0, set) == 0);
 	ATF_REQUIRE(cpuset_isset(0, set) == 0);
 
 	cpuset_destroy(set);
 }
 
 ATF_TC(cpuset_size);
 ATF_TC_HEAD(cpuset_size, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Test puset_size(3)");
 }
 
 ATF_TC_BODY(cpuset_size, tc)
 {
 	cpuset_t *set;
 	size_t size;
 
 	set = cpuset_create();
 	ATF_REQUIRE(set != NULL);
 
 	size = cpuset_size(set);
 
 	ATF_CHECK(cpuset_set((size * 8) - 1, set) == 0);
 	ATF_CHECK(cpuset_set((size * 8) + 1, set) == -1);
 
 	cpuset_destroy(set);
 }
 
 ATF_TP_ADD_TCS(tp)
 {
 
 	ATF_TP_ADD_TC(tp, cpuset_err);
 	ATF_TP_ADD_TC(tp, cpuset_set);
 	ATF_TP_ADD_TC(tp, cpuset_size);
 
 	return atf_no_error();
 }
diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile
index 2096f2066e52..a808f6617ec7 100644
--- a/lib/libc/tests/gen/Makefile
+++ b/lib/libc/tests/gen/Makefile
@@ -1,109 +1,110 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 ATF_TESTS_C+=		arc4random_test
 ATF_TESTS_C+=		dir2_test
 ATF_TESTS_C+=		dlopen_empty_test
 ATF_TESTS_C+=		fmtcheck2_test
 ATF_TESTS_C+=		fmtmsg_test
 ATF_TESTS_C+=		fnmatch2_test
 ATF_TESTS_C+=		fpclassify2_test
 ATF_TESTS_C+=		ftw_test
 ATF_TESTS_C+=		getentropy_test
 ATF_TESTS_C+=		getmntinfo_test
 ATF_TESTS_C+=		glob2_test
 ATF_TESTS_C+=		makecontext_test
 ATF_TESTS_C+=		popen_test
 ATF_TESTS_C+=		posix_spawn_test
 ATF_TESTS_C+=		realpath2_test
 ATF_TESTS_C+=		sigsetops_test
 ATF_TESTS_C+=		wordexp_test
 
-# TODO: t_closefrom, t_cpuset, t_fmtcheck, t_randomid,
+# TODO: t_closefrom, t_fmtcheck, t_randomid,
 # TODO: t_siginfo (fixes require further inspection)
 # TODO: t_sethostname_test (consistently screws up the hostname)
 
 FILESGROUPS+=		posix_spawn_test_FILES
 
 posix_spawn_test_FILES=	spawnp_enoexec.sh
 posix_spawn_test_FILESDIR=	${TESTSDIR}
 posix_spawn_test_FILESMODE= 0755
 posix_spawn_test_FILESOWN= root
 posix_spawn_test_FILESGRP= wheel
 posix_spawn_test_FILESPACKAGE=	${PACKAGE}
 
 CFLAGS+=	-DTEST_LONG_DOUBLE
 
 # Define __HAVE_LONG_DOUBLE for architectures whose long double has greater
 # precision than their double.
 .if ${MACHINE_CPUARCH} == "aarch64" || \
     ${MACHINE_CPUARCH} == "amd64" || \
     ${MACHINE_CPUARCH} == "i386" || \
     ${MACHINE_CPUARCH} == "riscv"
 CFLAGS+=	-D__HAVE_LONG_DOUBLE
 .endif
 
 NETBSD_ATF_TESTS_C=	alarm_test
 NETBSD_ATF_TESTS_C+=	assert_test
 NETBSD_ATF_TESTS_C+=	basedirname_test
+NETBSD_ATF_TESTS_C+=	cpuset_test
 NETBSD_ATF_TESTS_C+=	dir_test
 NETBSD_ATF_TESTS_C+=	floatunditf_test
 NETBSD_ATF_TESTS_C+=	fnmatch_test
 NETBSD_ATF_TESTS_C+=	fpclassify_test
 NETBSD_ATF_TESTS_C+=	fpsetmask_test
 NETBSD_ATF_TESTS_C+=	fpsetround_test
 NETBSD_ATF_TESTS_C+=	ftok_test
 NETBSD_ATF_TESTS_C+=	getcwd_test
 NETBSD_ATF_TESTS_C+=	getgrent_test
 NETBSD_ATF_TESTS_C+=	glob_test
 NETBSD_ATF_TESTS_C+=	humanize_number_test
 NETBSD_ATF_TESTS_C+=	isnan_test
 NETBSD_ATF_TESTS_C+=	nice_test
 NETBSD_ATF_TESTS_C+=	pause_test
 NETBSD_ATF_TESTS_C+=	raise_test
 NETBSD_ATF_TESTS_C+=	realpath_test
 NETBSD_ATF_TESTS_C+=	setdomainname_test
 NETBSD_ATF_TESTS_C+=	sethostname_test
 NETBSD_ATF_TESTS_C+=	sleep_test
 NETBSD_ATF_TESTS_C+=	syslog_test
 NETBSD_ATF_TESTS_C+=	time_test
 NETBSD_ATF_TESTS_C+=	ttyname_test
 NETBSD_ATF_TESTS_C+=	vis_test
 
 .include "../Makefile.netbsd-tests"
 
 CFLAGS.getentropy_test+=	-I${SRCTOP}/include
 LIBADD.getentropy_test+=	c
 LIBADD.humanize_number_test+=	util
 
 LIBADD.fpclassify_test+=m
 LIBADD.fpsetround_test+=m
 LIBADD.siginfo_test+=	m
 
 LIBADD.nice_test+=	pthread
 LIBADD.syslog_test+=	pthread
 
 CFLAGS+=		-I${.CURDIR}
 
 SRCS.fmtcheck2_test=	fmtcheck_test.c
 SRCS.fnmatch2_test=	fnmatch_test.c
 
 TEST_METADATA.setdomainname_test+=	is_exclusive=true
 TESTS_SUBDIRS=	execve
 TESTS_SUBDIRS+=	posix_spawn
 
 # The old testcase name
 TEST_FNMATCH=	test-fnmatch
 CLEANFILES+=		${GEN_SH_CASE_TESTCASES}
 sh-tests: .PHONY
 .for target in clean obj depend all
 	@cd ${.CURDIR} && ${MAKE} PROG=${TEST_FNMATCH} \
 	    -DNO_SUBDIR ${target}
 .endfor
 	@cd ${.OBJDIR} && ./${TEST_FNMATCH} -s 1 > \
 	    ${SRCTOP}/bin/sh/tests/builtins/case2.0
 	@cd ${.OBJDIR} && ./${TEST_FNMATCH} -s 2 > \
 	    ${SRCTOP}/bin/sh/tests/builtins/case3.0
 
 .include <bsd.test.mk>