diff --git a/contrib/ofed/usr.bin/Makefile b/contrib/ofed/usr.bin/Makefile
index ce8d6806ab35..10a43a41573d 100644
--- a/contrib/ofed/usr.bin/Makefile
+++ b/contrib/ofed/usr.bin/Makefile
@@ -4,7 +4,7 @@ SUBDIR= ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat \
 	ibsysstat ibtracert opensm perfquery saquery \
 	sminfo smpdump smpquery vendstat
 
-SUBDIR.${MK_TESTS}+= tests
+SUBDIR.${MK_TESTS}+= osmtest
 
 SUBDIR_PARALLEL=
 
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 19a7ccb143d3..611b42ab038c 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -47,4 +47,3 @@ HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
-.include <bsd.subdir.mk>