diff --git a/dev-python/thonny/thonny-4.1.7.ebuild b/dev-python/thonny/thonny-4.1.7.ebuild
index 3eab2fef92..a9de807726 100644
--- a/dev-python/thonny/thonny-4.1.7.ebuild
+++ b/dev-python/thonny/thonny-4.1.7.ebuild
@@ -4,12 +4,12 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..13} )
+PYTHON_COMPAT=( python3_{12..13} )
 PYTHON_REQ_USE="tk"
 
-inherit desktop distutils-r1 xdg
+inherit desktop distutils-r1 xdg optfeature
 
-DESCRIPTION="Thonny is a Python IDE meant for learning programming."
+DESCRIPTION="Thonny is a Python IDE meant for learning programming"
 HOMEPAGE="
 	https://thonny.org/ https://github.com/thonny/thonny"
 SRC_URI="
@@ -19,33 +19,19 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/jedi-0.18.1[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		dev-python/pylint[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	' 'python*'
-	)
+	>=dev-python/jedi-0.18.1[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/mypy[${PYTHON_USEDEP}]
+	dev-python/asttokens[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
 "
 
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	default
-}
+distutils_enable_tests pytest
 
 src_install() {
 	distutils-r1_src_install
@@ -55,12 +41,8 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	elog "Thonny has been installed."
-	elog "To use Thonny with a specific Python version, you can set"
-	elog "the interpreter in Tools -> Options -> Interpreter"
-	elog ""
-	elog "For MicroPython/CircuitPython support, you may need additional"
-	elog "packages like dev-python/esptool or dev-python/adafruit-ampy"
+	optfeature "CircuitPython support" dev-python/esptool
+	optfeature "MicroPython support" dev-python/adafruit-ampy
 }
 
 pkg_postrm() {