diff --git a/www/py-django-tinymce/Makefile b/www/py-django-tinymce/Makefile
index 9b2da813107f..ce8dc82e1e78 100644
--- a/www/py-django-tinymce/Makefile
+++ b/www/py-django-tinymce/Makefile
@@ -1,30 +1,35 @@
 # Created by: Kozlov Sergey <kozlov.sergey.404@gmail.com>
 
 PORTNAME=	django-tinymce
-PORTVERSION=	3.3.0
+PORTVERSION=	3.4.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Django application to use TinyMCE editor
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
+TEST_ENV=	DJANGO_SETTINGS_MODULE=tests.settings PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+
 NO_ARCH=	yes
 
 PORTDOCS=	*.rst
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.rst ${STAGEDIR}${DOCSDIR}
 
+do-test:
+	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m django test -v3
+
 .include <bsd.port.mk>
diff --git a/www/py-django-tinymce/distinfo b/www/py-django-tinymce/distinfo
index 64efc7cc6259..6f33191140eb 100644
--- a/www/py-django-tinymce/distinfo
+++ b/www/py-django-tinymce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617818606
-SHA256 (django-tinymce-3.3.0.tar.gz) = 77cca137e97e92e43e42c98a232df3e66b80c987ad0f03709a4b73435f8e4060
-SIZE (django-tinymce-3.3.0.tar.gz) = 795086
+TIMESTAMP = 1638286434
+SHA256 (django-tinymce-3.4.0.tar.gz) = 275653dbf09fbd3347928757d6baf29040b42fe5c5d95396418c36aa4b1517eb
+SIZE (django-tinymce-3.4.0.tar.gz) = 960490
diff --git a/www/py-django-tinymce/files/patch-setup.py b/www/py-django-tinymce/files/patch-setup.py
new file mode 100644
index 000000000000..7bf69c586e70
--- /dev/null
+++ b/www/py-django-tinymce/files/patch-setup.py
@@ -0,0 +1,16 @@
+Avoid the installation of the test suite in the top-level directory
+of ${PYTHON_SITELIBDIR}.
+
+https://github.com/jazzband/django-tinymce/issues/355
+
+--- setup.py.orig	2021-11-30 16:45:41 UTC
++++ setup.py
+@@ -21,7 +21,7 @@ CHANGELOG = read_file("CHANGELOG.rst")
+ setup(
+     name="django-tinymce",
+     version="3.4.0",
+-    packages=find_packages(),
++    packages=find_packages(exclude=['tests*']),
+     include_package_data=True,
+     author="Aljosa Mohorovic",
+     author_email="aljosa.mohorovic@gmail.com",