--- a/lang/pypy310/Makefile	Wed Mar 12 17:08:29 2025 +0100
+++ b/lang/pypy310/Makefile	Thu Mar 13 20:19:50 2025 +0100
@@ -51,12 +51,17 @@
 BCCHECKEDHASH_DESC=	Use checked hash based .pyc file invalidataion
 BCUNCHECKEDHASH_DESC=	Use unchecked hash based .pyc file invalidataion
 
+PYTHON_USES=		python:2.7,build,test
 PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR}
-PYTHON_USES=	python:2.7,build
+PYTHON_VARS=		TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
+PYPY_USES=		python:2.7,test
 PYPY_BUILD_DEPENDS=	pypy2:lang/pypy2
-PYPY_VARS=	PYTHON_CMD=${LOCALBASE}/bin/pypy
+PYPY_VARS=		PYTHON_CMD=${LOCALBASE}/bin/pypy \
+			TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
+PYPY_MINMEM_USES=		python:2.7,test
 PYPY_MINMEM_BUILD_DEPENDS=	pypy2:lang/pypy2
-PYPY_MINMEM_VARS=	PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300"
+PYPY_MINMEM_VARS=		PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300" \
+				TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
 BCTIMESTAMP_VARS=	COMPILEALL_INVALIDATIONMODE=timestamp
 BCCHECKEDHASH_VARS=	COMPILEALL_INVALIDATIONMODE=checked-hash
 BCUNCHECKEDHASH_VARS=	COMPILEALL_INVALIDATIONMODE=unchecked-hash
@@ -187,16 +192,16 @@
 	# add_translated_tests()
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \
-		${WRKSRC}/pypy/goal/${PYPY_EXECUTABLE} testrunner/runner.py --root pypy --logfile=pytest-A.log \
+		${TESTRUNNER_PYTHON_CMD} testrunner/runner.py --root pypy --logfile=pytest-A.log \
 			--parallel-runs ${MAKE_JOBS_NUMBER} \
 			--config pypy/pytest-A.cfg --config pypy/pytest-A.py)
 .for dir in lib-python pypy/module/pypyjit/test
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \
-		${WRKSRC}/pypy/goal/${PYPY_EXECUTABLE} pypy/test_all.py --basetemp ${WRKDIR}/build --pypy pypy/goal/${PYPY_EXECUTABLE} \
+		${TESTRUNNER_PYTHON_CMD} pypy/test_all.py --basetemp ${WRKDIR}/build --pypy pypy/goal/${PYPY_EXECUTABLE} \
 			${dir} )
 .endfor
-	(cd ${WRKSRC}/lib-python/2.7/test; \
+	(cd ${WRKSRC}/lib-python/3/test; \
 		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \
 		${WRKSRC}/pypy/goal/${PYPY_EXECUTABLE} regrtest.py -vvu all)