diff --git a/contrib/netbsd-tests/lib/libm/t_cbrt.c b/contrib/netbsd-tests/lib/libm/t_cbrt.c
--- a/contrib/netbsd-tests/lib/libm/t_cbrt.c
+++ b/contrib/netbsd-tests/lib/libm/t_cbrt.c
@@ -269,8 +269,8 @@
 	size_t i;
 
 #if defined(__amd64__) && defined(__clang__) && __clang_major__ >= 7 && \
-    __FreeBSD_cc_version < 1300002
-	atf_tc_expect_fail("test fails with clang 7+ - bug 234040");
+    __clang_major__ < 10 && __FreeBSD_cc_version < 1300002
+	atf_tc_expect_fail("test fails with clang 7-9 - bug 234040");
 #endif
 
 	for (i = 0; i < __arraycount(x); i++) {
diff --git a/lib/msun/tests/trig_test.c b/lib/msun/tests/trig_test.c
--- a/lib/msun/tests/trig_test.c
+++ b/lib/msun/tests/trig_test.c
@@ -161,7 +161,7 @@
 	unsigned i;
 
 #if defined(__amd64__) && defined(__clang__) && __clang_major__ >= 7 && \
-    __FreeBSD_cc_version < 1300002
+    __clang_major__ < 10 && __FreeBSD_cc_version < 1300002
 	atf_tc_expect_fail("test fails with clang 7+ - bug 234040");
 #endif