diff --git a/textproc/py-pyscss/Makefile b/textproc/py-pyscss/Makefile
index 1264d297fc9b..42b55036fc90 100644
--- a/textproc/py-pyscss/Makefile
+++ b/textproc/py-pyscss/Makefile
@@ -1,28 +1,24 @@
 # Created by: Ilya A. Arkhipov <rum1cro@yandex.ru>
 
 PORTNAME=	pyscss
 PORTVERSION=	1.3.7
 CATEGORIES=	textproc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rum1cro@yandex.ru
 COMMENT=	Compiler for SCSS flavor of the Sass language
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 LIB_DEPENDS=	libpcre.so:devel/pcre
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Kronuz
 GH_PROJECT=	pyScss
 
-USES=		python:3.6+ localbase:ldflags
+USES=		python:3.6+ localbase:ldflags pytest:4
 USE_PYTHON=	distutils autoplist
 
-do-test:
-	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
-
 .include <bsd.port.mk>
diff --git a/textproc/py-pyscss/files/patch-scss_tests_test__cli.py b/textproc/py-pyscss/files/patch-scss_tests_test__cli.py
new file mode 100644
index 000000000000..562d448de1da
--- /dev/null
+++ b/textproc/py-pyscss/files/patch-scss_tests_test__cli.py
@@ -0,0 +1,19 @@
+https://github.com/Kronuz/pyScss/pull/425
+
+--- scss/tests/test_cli.py.orig	2020-03-26 15:04:27 UTC
++++ scss/tests/test_cli.py
+@@ -1,4 +1,5 @@
+ """Test the command-line tool from the outside."""
++import sys
+ from subprocess import PIPE, Popen
+ 
+ # TODO: this needs way, way, way, way more tests
+@@ -6,7 +7,7 @@ from subprocess import PIPE, Popen
+ 
+ def test_stdio():
+     proc = Popen(
+-        ['python', '-m', 'scss.tool', '-C'],
++        [sys.executable, '-m', 'scss.tool', '-C'],
+         stdin=PIPE,
+         stdout=PIPE,
+         # this automatically handles encoding/decoding on py3