diff --git a/user/py3-wand/APKBUILD b/testing/py3-wand/APKBUILD
similarity index 63%
rename from user/py3-wand/APKBUILD
rename to testing/py3-wand/APKBUILD
index f1f6066..9bba4a0 100644
--- a/user/py3-wand/APKBUILD
+++ b/testing/py3-wand/APKBUILD
@@ -7,21 +7,38 @@ pkgver=0.6.11
 pkgrel=0
 pkgdesc="Ctypes-based simple MagickWand API binding for Python"
 url="https://github.com/emcconville/wand"
-license='MIT'
-arch='noarch'
-depends='imagemagick libxml2 python3'
-makedepends='py3-setuptools'
+license="MIT"
+arch="noarch"
+depends="
+	imagemagick
+	libxml2
+	"
+makedepends="
+	py3-setuptools
+	py3-gpep517
+	py3-wheel
+	py3-installer
+	"
 source="$pkgname-$pkgver.tar.gz::https://github.com/emcconville/wand/archive/$pkgver.tar.gz"
-options="!check" # No testsuite
+options="!check" # Failing test units
 builddir="$srcdir"/$_pkgname-$pkgver
+subpackages="$pkgname-pyc"
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	pytest -v
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 -m installer -d "$pkgdir" \
+		dist/*.whl
 }
+
 sha512sums="
 996073d1b22fdd7924801114b24d803eb15e94c8980800a4ddb58110f72f9495aebc4de227db3a07af9c754a96c369c9ba7c7201442933ba653df1eefb74165f  py3-wand-0.6.11.tar.gz
 "