diff --git a/math/fastops/Makefile b/math/fastops/Makefile
index 3d039e2b74af..31f32a02e4e7 100644
--- a/math/fastops/Makefile
+++ b/math/fastops/Makefile
@@ -1,20 +1,32 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	fastops
 PORTVERSION=	1.0.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	AVX/AVX2-accelerated bulk call of math functions
 
 LICENSE=	MIT
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	uses AVX and AVX2 instructions
 
 USES=		cmake compiler:c++17-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	yandex
 
+do-test:
+	${TEST_WRKSRC}/${PORTNAME}/ut/${PORTNAME}_test
+
+post-stage:
+# Rename generically-named binaries to avoid potential clashes
+.for p in benchmark eval
+	${MV} ${STAGEDIR}${PREFIX}/bin/${p} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}_${p}
+.endfor
+# Remove the test program (we run tests, but not install them)
+	${RM} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}_test
+
 .include <bsd.port.mk>
diff --git a/math/fastops/pkg-plist b/math/fastops/pkg-plist
index 736d23848c3a..297efb5e412d 100644
--- a/math/fastops/pkg-plist
+++ b/math/fastops/pkg-plist
@@ -1,11 +1,10 @@
-bin/benchmark
-bin/eval
-bin/fastops_test
+bin/fastops_benchmark
+bin/fastops_eval
 include/avx/ops_avx.h
 include/avx2/ops_avx2.h
 include/core/FastIntrinsics.h
 include/core/SIMDFunctions.h
 include/core/avx_id.h
 include/fastops.h
 include/plain/ops_plain.h
 lib/libfastops.a