diff --git a/cad/py-cocotb/Makefile b/cad/py-cocotb/Makefile
index a2168ec07d4d..211f36f0ab29 100644
--- a/cad/py-cocotb/Makefile
+++ b/cad/py-cocotb/Makefile
@@ -1,40 +1,48 @@
 PORTNAME=	cocotb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.2
 CATEGORIES=	cad python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Coroutine based cosimulation library for writing VHDL and Verilog
 WWW=		https://www.cocotb.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}find-libpython>0:devel/py-find-libpython@${PY_FLAVOR} \
 		gtkwave:cad/gtkwave
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	pep517 autoplist pytest # https://github.com/cocotb/cocotb/issues/3230
+USES=		python:3.6+ shebangfix
+USE_PYTHON=	pep517 autoplist
 USE_GITHUB=	yes
 
-TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
-TEST_WRKSRC=	${WRKSRC}/tests
+SHEBANG_GLOB=	*.py
+
+TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
+		PATH=${STAGEDIR}${LOCALBASE}/bin:${PATH} \
+		LD_LIBRARY_PATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/cocotb/libs \
+		SIM=icarus
 
 OPTIONS_DEFINE=		IVERILOG VERILATOR # GHDL - TODO
 OPTIONS_DEFAULT=	IVERILOG VERILATOR
 
 IVERILOG_DESC=		Iverilog dependency
 IVERILOG_RUN_DEPENDS=	iverilog:cad/iverilog
 
 VERILATOR_DESC=		Verilator dependency
 VERILATOR_RUN_DEPENDS=	verilator:cad/verilator
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/cocotb/simulator${PYTHON_EXT_SUFFIX}.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/cocotb/libs/lib*.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/cocotb/libs/libcocotbvpi_icarus.vpl
 
+do-test: # some tests fail, see https://github.com/cocotb/cocotb/issues/3236
+	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${GMAKE} test
+
 .include <bsd.port.mk>