diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index 6ff12838e459..451676deb9f2 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,48 +1,49 @@
 # Created by: Mikolaj Golub <to.my.trociny@gmail.com>
 
 PORTNAME=	bmake
 PORTVERSION=	20220418
 CATEGORIES=	devel
 MASTER_SITES=	https://ftp.netbsd.org/pub/NetBSD/misc/sjg/
 
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	Portable version of NetBSD 'make' utility
 
 LICENSE=	BSD3CLAUSE
 
 PORTSCOUT=	skipv:200910007
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAKE_ENV+=	CONFIG_SITE=${CONFIG_SITE}
 
-.if defined(BATCH)
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-unit-tests_Makefile
-.endif
-
 post-patch:	.SILENT
 	${REINPLACE_CMD} 's/^\.Nx/NetBSD/' ${WRKDIR}/bmake/bmake.1
 
 do-build:
-	${SETENV} ${MAKE_ENV} ${SH} ${WRKDIR}/bmake/boot-strap \
+	${SETENV} ${MAKE_ENV} ${SH} ${WRKDIR}/bmake/boot-strap op=build \
+		--with-default-sys-path='.../share/mk:${PREFIX}/share/mk' \
+		-m ${WRKDIR}/mk objdir=${WRKDIR}/obj prefix=${PREFIX}
+
+do-test:
+	${SETENV} ${MAKE_ENV} ${SH} ${WRKDIR}/bmake/boot-strap op=test \
 		--with-default-sys-path='.../share/mk:${PREFIX}/share/mk' \
 		-m ${WRKDIR}/mk objdir=${WRKDIR}/obj prefix=${PREFIX}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/obj/bmake ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/bmake/bmake.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${SH} ${WRKSRC}/mk/install-mk -v ${STAGEDIR}${PREFIX}/share/mk
 	${CHMOD} -x ${STAGEDIR}${PREFIX}/share/mk/meta2deps.py
 	cd ${STAGEDIR}${PREFIX} ;					\
 	    ${FIND} share/mk -type f -o -type l				\
 		| ${SORT}						\
 		>${WRKDIR}/PLIST.share-mk
 	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.share-mk"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-mk"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-mk
 	cd ${WRKDIR} ; ex < ex.script
 
 .include <bsd.port.mk>
diff --git a/devel/bmake/files/extrapatch-unit-tests_Makefile b/devel/bmake/files/extrapatch-unit-tests_Makefile
deleted file mode 100644
index 38d1fcf8425a..000000000000
--- a/devel/bmake/files/extrapatch-unit-tests_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- unit-tests/Makefile.orig	2020-11-29 08:44:23 UTC
-+++ unit-tests/Makefile
-@@ -38,7 +38,7 @@
- TESTS+=		archive-suffix
- TESTS+=		cmd-errors
- TESTS+=		cmd-errors-lint
--TESTS+=		cmd-interrupt
-+#TESTS+=		cmd-interrupt
- TESTS+=		cmdline
- TESTS+=		cmdline-undefined
- TESTS+=		comment
diff --git a/devel/bmake/files/patch-boot-strap b/devel/bmake/files/patch-boot-strap
new file mode 100644
index 000000000000..e17b2d885bd0
--- /dev/null
+++ b/devel/bmake/files/patch-boot-strap
@@ -0,0 +1,12 @@
+--- boot-strap.orig	2022-06-29 08:25:21.380209000 +0300
++++ boot-strap	2022-06-29 08:25:03.068725000 +0300
+@@ -413,9 +413,6 @@
+ 	[ -s make-bootstrap.sh ] || op_configure
+ 	chmod 755 make-bootstrap.sh || exit 1
+ 	./make-bootstrap.sh || exit 1
+-	case "$op" in
+-	build) op_test;;
+-	esac
+ }
+ 
+ op_test() {
diff --git a/devel/bmake/files/patch-unit-tests_Makefile b/devel/bmake/files/patch-unit-tests_Makefile
deleted file mode 100644
index 4bdebdb047e2..000000000000
--- a/devel/bmake/files/patch-unit-tests_Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- unit-tests/Makefile.orig	2021-02-06 18:31:52 UTC
-+++ unit-tests/Makefile
-@@ -102,7 +102,7 @@ TESTS+=		depsrc-exec
- TESTS+=		depsrc-ignore
- TESTS+=		depsrc-made
- TESTS+=		depsrc-make
--TESTS+=		depsrc-meta
-+#TESTS+=		depsrc-meta
- TESTS+=		depsrc-nometa
- TESTS+=		depsrc-nometa_cmp
- TESTS+=		depsrc-nopath
-@@ -209,7 +209,7 @@ TESTS+=		jobs-error-nested
- TESTS+=		jobs-error-nested-make
- TESTS+=		lint
- TESTS+=		make-exported
--TESTS+=		meta-cmd-cmp
-+#TESTS+=		meta-cmd-cmp
- TESTS+=		moderrs
- TESTS+=		modmatch
- TESTS+=		modmisc
-@@ -339,13 +339,13 @@ TESTS+=		varmod-defined
- TESTS+=		varmod-edge
- TESTS+=		varmod-exclam-shell
- TESTS+=		varmod-extension
--TESTS+=		varmod-gmtime
-+#TESTS+=		varmod-gmtime
- TESTS+=		varmod-hash
- TESTS+=		varmod-head
- TESTS+=		varmod-ifelse
- TESTS+=		varmod-indirect
- TESTS+=		varmod-l-name-to-value
--TESTS+=		varmod-localtime
-+#TESTS+=		varmod-localtime
- TESTS+=		varmod-loop
- TESTS+=		varmod-match
- TESTS+=		varmod-match-escape