diff --git a/devel/py-intbitset/Makefile b/devel/py-intbitset/Makefile
index ae2013d2af31..3952dc2fae6e 100644
--- a/devel/py-intbitset/Makefile
+++ b/devel/py-intbitset/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	intbitset
-DISTVERSION=	2.4.1
+DISTVERSION=	3.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,16 +10,17 @@ COMMENT=	C-based extension implementing fast integer bit sets
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	cython distutils autoplist
 
+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/intbitset*.so
 
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+	@cd ${WRKSRC} && ${SETENV} ${TESTENV} ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
diff --git a/devel/py-intbitset/distinfo b/devel/py-intbitset/distinfo
index 8fb6da9a7c5f..8e590792022f 100644
--- a/devel/py-intbitset/distinfo
+++ b/devel/py-intbitset/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606939646
-SHA256 (intbitset-2.4.1.tar.gz) = 44bca80b8cc702d5a56f0686f2bb5e028ab4d0c2c1761941589d46b7fa2c701c
-SIZE (intbitset-2.4.1.tar.gz) = 152893
+TIMESTAMP = 1646344830
+SHA256 (intbitset-3.0.0.tar.gz) = b431b708095366fcfd3e2da92ead1310f865dc3c98b96412d4de9534d3689041
+SIZE (intbitset-3.0.0.tar.gz) = 151762
diff --git a/devel/py-intbitset/files/patch-setup.py b/devel/py-intbitset/files/patch-setup.py
deleted file mode 100644
index a32aea77007c..000000000000
--- a/devel/py-intbitset/files/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Respect CFLAGS, remove x86 specific -march tuning which fails on !x86 archs
-# https://svnweb.freebsd.org/changeset/ports/476958
-
---- setup.py.orig	2018-08-12 04:50:38 UTC
-+++ setup.py
-@@ -48,7 +48,6 @@ setup(
-     ext_modules=[
-         Extension("intbitset",
-                   ["intbitset/intbitset.c", "intbitset/intbitset_impl.c"],
--                  extra_compile_args=['-O3', '-march=core2', '-mtune=native']
-                   # For debug -> '-ftree-vectorizer-verbose=2'
-                   )
-     ],