diff --git a/mail/py-offlineimap3/Makefile b/mail/py-offlineimap3/Makefile
index 06697d2ae735..cc7cd1bd6631 100644
--- a/mail/py-offlineimap3/Makefile
+++ b/mail/py-offlineimap3/Makefile
@@ -1,90 +1,88 @@
 PORTNAME=	offlineimap3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.0.0-18
 DISTVERSIONSUFFIX=	-g${GH_TAGNAME}
 CATEGORIES=	mail python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dereks@lifeofadishwasher.com
 COMMENT=	Two-way synchronization of local Maildir and IMAP folders
 WWW=		https://github.com/OfflineIMAP/offlineimap3
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # setup.py requires these during build time. Possible move to setup/install_requires:
 # https://github.com/OfflineIMAP/offlineimap3/issues/110
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distro>=0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imaplib2>=3.5:mail/py-imaplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc6555>=0:mail/py-rfc6555@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=2020.6.20:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imaplib2>=3.5:mail/py-imaplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc6555>=0:mail/py-rfc6555@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.9:net/py-urllib3@${PY_FLAVOR}
 
-# Upstream doesn't have exact version currently only able to test up to 3.9 since
-# imaplib2 is 3.6-3.9.
-USES=		pytest python:3.8-3.9
+USES=		pytest python
 
 # Project is currently not publishing to pypi sdist.  pypi/naming status:
 # https://github.com/OfflineIMAP/offlineimap3/issues/111
 USE_GITHUB=	yes
 GH_ACCOUNT=	OfflineIMAP
 GH_TAGNAME=	253f97a3e947
 
 USE_PYTHON=	autoplist concurrent distutils
 
 CONFLICTS_INSTALL=	mail/py-offlineimap
 
 NO_ARCH=	yes
 
 PORTDOCS=	*
 PORTEXAMPLES=	offlineimap.conf
 
 OPTIONS_DEFINE=		DOCS EXAMPLES GSSAPI MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
 COMMON_BUILD_DEPENDS=	a2x:textproc/asciidoc \
 			gmake:devel/gmake
 
 DOCS_BUILD_DEPENDS=	${COMMON_BUILD_DEPENDS} \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
 
 GSSAPI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gssapi>=1.6.9:security/py-gssapi@${PY_FLAVOR}
 
 MANPAGES_BUILD_DEPENDS=	${COMMON_BUILD_DEPENDS}
 MANPAGES_PLIST_FILES+=	man/man1/offlineimap.1.gz \
 			man/man7/offlineimapui.7.gz
 
 # In concurrent env. sphinx-build is only exist for py38 add "-${PYTHON_VER}" to command
 post-patch:
 	cd ${WRKSRC} && \
 	${REINPLACE_CMD} '/^SPHINXBUILD = sphinx-build$$/s/$$/-${PYTHON_VER}/' \
 		docs/Makefile
 
 post-build-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${GMAKE} docs && \
 	cd html && \
 	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		'! ( -name .lock -or -name .buildinfo )'
 
 post-build-MANPAGES-on:
 	${MKDIR} ${STAGEDIR}${MAN7PREFIX}/man/man7/
 	${MKDIR} ${STAGEDIR}${MAN7PREFIX}/man/man1/
 	cd ${WRKSRC}/docs && ${GMAKE} man && \
 	${INSTALL_MAN} offlineimapui.7 ${STAGEDIR}${MAN7PREFIX}/man/man7/ && \
 	${INSTALL_MAN} offlineimap.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/offlineimap.conf ${STAGEDIR}${EXAMPLESDIR}
 
 pre-test:
 	cd ${WRKSRC} && \
 	${CP} test/credentials.conf.sample test/credentials.conf
 
 .include <bsd.port.mk>