diff --git a/dev-python/btlewrap/btlewrap-0.1.1.ebuild b/dev-python/btlewrap/btlewrap-0.1.1-r1.ebuild
similarity index 78%
rename from dev-python/btlewrap/btlewrap-0.1.1.ebuild
rename to dev-python/btlewrap/btlewrap-0.1.1-r1.ebuild
index f4430d6..fb2c6d5 100644
--- a/dev-python/btlewrap/btlewrap-0.1.1.ebuild
+++ b/dev-python/btlewrap/btlewrap-0.1.1-r1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_10 )
-
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
 inherit distutils-r1
 
 DESCRIPTION="wrapper around different bluetooth low energy backends"
@@ -24,10 +24,6 @@ RDEPEND="
 "
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
 "
 
 src_prepare() {
@@ -35,7 +31,5 @@ src_prepare() {
 	default
 }
 
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
+distutils_enable_tests nose
+distutils_enable_tests pytest
diff --git a/dev-python/btlewrap/metadata.xml b/dev-python/btlewrap/metadata.xml
index a1ca49a..f5ccd85 100644
--- a/dev-python/btlewrap/metadata.xml
+++ b/dev-python/btlewrap/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">btlewrap</remote-id>
-    <maintainer status="unknown">
-      <email>christian.kuehnel@gmail.com</email>
-      <name>Christian Kuehnel</name>
-    </maintainer>
-  </upstream>
+	<maintainer type="project">
+		<email>b@edevau.net</email>
+		<name>Andreas Billmeier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">btlewrap</remote-id>
+		<remote-id type="github">ChristianKuehnel/btlewrap</remote-id>
+		<maintainer status="unknown">
+			<email>christian.kuehnel@gmail.com</email>
+			<name>Christian Kuehnel</name>
+		</maintainer>
+	</upstream>
 </pkgmetadata>