diff --git a/Mk/common.mk b/Mk/common.mk
index d0919334f..bfd8be9ff 100644
--- a/Mk/common.mk
+++ b/Mk/common.mk
@@ -23,9 +23,4 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-WRKDIR?=${.CURDIR}/work
-WRKSRC?=${WRKDIR}/src
-PKGDIR?=${WRKDIR}/pkg
-MFCDIR?=/tmp/mfc.dir
-
 .-include "${PLUGINSDIR}/../core/Mk/common.mk"
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 2a20886b1..5142592ea 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -92,3 +92,9 @@ SED_REPLACE=	# empty
 .for REPLACEMENT in ${REPLACEMENTS}
 SED_REPLACE+=	-e "s=%%${REPLACEMENT}%%=${${REPLACEMENT}}=g"
 .endfor
+
+WRKDIR?=	${.CURDIR}/work
+MFCDIR?=	/tmp/mfc.dir
+PKGDIR?=	${WRKDIR}/pkg
+WRKSRC?=	${WRKDIR}/src
+TESTDIR?=	${.CURDIR}/src/opnsense/mvc/tests
diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index 246a62613..96427a06c 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -354,11 +354,10 @@ revision:
 	@MAKE=${MAKE} ${SCRIPTSDIR}/revbump.sh ${.CURDIR}
 
 test: check
-	@if [ -d ${.CURDIR}/src/opnsense/mvc/tests ]; then \
-		cd ${LOCALBASE}/opnsense/mvc/tests && \
-		    phpunit --configuration PHPunit.xml \
-		    ${.CURDIR}/src/opnsense/mvc/tests; \
-	fi
+.if exists(${TESTDIR})
+	@cd ${TESTDIR} && phpunit || true; \
+	    rm -rf ${TESTDIR}/.phpunit.result.cache
+.endif
 
 commit:
 	@mkdir -p ${MFCDIR}