diff --git a/Makefile b/Makefile
index e27d85877..8cfcd9c03 100644
--- a/Makefile
+++ b/Makefile
@@ -204,9 +204,10 @@ CORE_CONFLICTS+=	${CONFLICT}-devel
 CORE_CONFLICTS:=	${CORE_CONFLICTS:S/^/os-/g:O}
 
 WRKDIR?=${.CURDIR}/work
-WRKSRC?=${WRKDIR}/src
-PKGDIR?=${WRKDIR}/pkg
 MFCDIR?=${WRKDIR}/mfc
+PKGDIR?=${WRKDIR}/pkg
+WRKSRC?=${WRKDIR}/src
+TESTDIR?=${.CURDIR}/src/opnsense/mvc/tests
 
 debug:
 	@${VERSIONBIN} ${@} > /dev/null
@@ -560,8 +561,10 @@ test: debug
 		echo "Installed version does not match, expected ${CORE_PKGVERSION}"; \
 		exit 1; \
 	fi
-	@cd ${.CURDIR}/src/opnsense/mvc/tests && phpunit || true; \
-	    rm -f .phpunit.result.cache
+	@cd ${TESTDIR} && phpunit || true; rm -rf ${TESTDIR}/.phpunit.result.cache \
+	    ${TESTDIR}/app/models/OPNsense/ACL/AclConfig/backup; \
+	    git checkout -f ${TESTDIR}/app/models/OPNsense/ACL/AclConfig/config.xml
+
 
 checkout:
 	@${GIT} reset -q ${.CURDIR}/src && \