diff --git a/dev-python/vdirsyncer/metadata.xml b/dev-python/vdirsyncer/metadata.xml
index 06fce01547f77..f42dda4bb8ace 100644
--- a/dev-python/vdirsyncer/metadata.xml
+++ b/dev-python/vdirsyncer/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pimutils/vdirsyncer</remote-id>
 		<remote-id type="pypi">vdirsyncer</remote-id>
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
index 05fd220b6b811..d902fe2f289be 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
@@ -5,7 +5,6 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -17,8 +16,6 @@ LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/${PN}-0.16.8-click-7-compat.patch" )
-
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]
 	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
 	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
@@ -45,5 +42,12 @@ python_test() {
 	# pytest dies hard if the envvars do not have any value...
 	local -x CI=false
 	local -x DETERMINISTIC_TESTS=false
-	epytest
+
+	local deselect=(
+		# test CA is too weak for modern python
+		tests/system/utils/test_main.py::test_request_ssl
+		tests/system/utils/test_main.py::test_request_ssl_fingerprints
+	)
+
+	epytest ${deselect[@]/#/--deselect }
 }