diff --git a/contrib/netbsd-tests/lib/libcrypt/t_crypt.c b/contrib/netbsd-tests/lib/libcrypt/t_crypt.c
index a5a4dcbc41fd..9b476924b5d5 100644
--- a/contrib/netbsd-tests/lib/libcrypt/t_crypt.c
+++ b/contrib/netbsd-tests/lib/libcrypt/t_crypt.c
@@ -124,11 +124,13 @@ ATF_TC_HEAD(crypt_salts, tc)
 ATF_TC_BODY(crypt_salts, tc)
 {
 	for (size_t i = 0; tests[i].hash; i++) {
-#if defined(__FreeBSD__)
-		if (22 <= i)
-			atf_tc_expect_fail("Old-style/bad inputs fail on FreeBSD");
-#endif
 		char *hash = crypt(tests[i].pw, tests[i].hash);
+#if defined(__FreeBSD__)
+		if (i >= 22 && i != 24 && i != 25)
+			atf_tc_expect_fail("Old-style/bad inputs fail on FreeBSD");
+		else
+			atf_tc_expect_pass();
+#endif
 		if (!hash) {
 			ATF_CHECK_MSG(0, "Test %zu NULL\n", i);
 			continue;