Index: head/lib/atf/libatf-c/tests/Makefile
===================================================================
--- head/lib/atf/libatf-c/tests/Makefile	(revision 345892)
+++ head/lib/atf/libatf-c/tests/Makefile	(revision 345893)
@@ -1,36 +1,43 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 PACKAGE=	tests
 
 TESTS_SUBDIRS=	detail
 
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
 
 CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
 CFLAGS+=	-I${ATF}
 
 # macros_test.c contains a double 'const const' which will be gone with
 # the import of atf-0.18.
 # TODO(jmmv): Remove this workaround once we do that update.
 CFLAGS.clang+=	-Wno-duplicate-decl-specifier
 
 ${PACKAGE}FILES+=	macros_h_test.c
 ${PACKAGE}FILES+=	unused_test.c
 
 .for _T in	atf_c_test \
 		build_test \
 		check_test \
 		error_test \
 		macros_test \
 		tc_test \
 		tp_test \
 		utils_test
 ATF_TESTS_C+=	${_T}
 SRCS.${_T}=	${_T}.c test_helpers.c
 .endfor
 
+.for _T in	atf_c_test \
+		build_test \
+		check_test \
+		macros_test
+TEST_METADATA.${_T}+=	required_programs="cc"
+.endfor
+
 .include <bsd.test.mk>
Index: head/lib/atf/libatf-c++/tests/Makefile
===================================================================
--- head/lib/atf/libatf-c++/tests/Makefile	(revision 345892)
+++ head/lib/atf/libatf-c++/tests/Makefile	(revision 345893)
@@ -1,30 +1,37 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 PACKAGE=	tests
 
 TESTS_SUBDIRS=	detail
 
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-c++
 .PATH:		${ATF}/atf-c++/detail
 
 CFLAGS+=	-DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"'
 CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
 CFLAGS+=	-I${ATF}
 
 ${PACKAGE}FILES+=	macros_hpp_test.cpp
 ${PACKAGE}FILES+=	unused_test.cpp
 
 .for _T in	atf_c++_test \
 		build_test \
 		check_test \
 		macros_test \
 		tests_test \
 		utils_test
 ATF_TESTS_CXX+=	${_T}
 SRCS.${_T}=	${_T}.cpp test_helpers.cpp
 .endfor
 
+.for _T in	atf_c++_test \
+		build_test \
+		check_test \
+		macros_test
+TEST_METADATA.${_T}+=	required_programs="c++"
+.endfor
+
 .include <bsd.test.mk>