diff --git a/user/py3-django-q/APKBUILD b/testing/py3-django-q/APKBUILD
similarity index 61%
rename from user/py3-django-q/APKBUILD
rename to testing/py3-django-q/APKBUILD
index 607103b..f2f0030 100644
--- a/user/py3-django-q/APKBUILD
+++ b/testing/py3-django-q/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=py3-django-q
 _pyname="django-q"
-pkgver=1.5.2
+pkgver=1.5.4
 pkgrel=0
 arch="noarch"
 pkgdesc="A multiprocessing distributed task queue for Django"
@@ -15,6 +15,7 @@ depends="
 	py3-dateutil
 	py3-django
 	py3-django-picklefield
+	py3-django-redis
 	py3-future
 	py3-tz
 	py3-redis
@@ -22,23 +23,38 @@ depends="
 	py3-sqlparse
 	py3-wcwidth
 	"
-makedepends='poetry py3-pip'
+makedepends="
+	py3-gpep517
+	py3-installer
+	py3-wheel
+	py3-setuptools
+	"
+checkdepends="
+	py3-pytest
+"
 #  'python-boto3: Amazon Simple Queue Service message queue support'
 #  'python-psutil: resource usage limit support'
 #  'python-pymongo: MongoDB as a message broker support'
-options="!check" # No testsuite
+options="!check" # Missing check depends
 source="$pkgname-$pkgver.tar.gz::https://github.com/django-q2/django-q2/archive/refs/tags/v$pkgver.tar.gz"
 builddir="$srcdir"/django-q2-$pkgver
+subpackages="$pkgname-pyc"
 
 build() {
-	poetry build --format wheel
+	gpep517 build-wheel \
+		--wheel-dir dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	PYTHONPATH="$builddir" pytest -v
 }
 
 package() {
-	PIP_CONFIG_FILE=/dev/null pip install --isolated --root="$pkgdir" --ignore-installed --no-deps dist/*.whl
-	cp django_q -R "$pkgdir"/usr/lib/python*/site-packages/.
+	python3 -m installer -d "$pkgdir" \
+		dist/*.whl
 }
 
 sha512sums="
-2507fd0cd78dc3721678457521f9a5d1deabf5d52f18a66b6e12b1c9d065c4d0974ccd21e5231060300fbcc18a0e265a9652916b33a38683688bd39374453f9f  py3-django-q-1.5.2.tar.gz
+ebed301dc1f4a9854f9963137997219f08abed9c10ef86d363a658b83e17968ea5f62e5641ff7c6be92df4b7d5dc539dc1fed6def56ea4fb50ccc4ec0787bd6d  py3-django-q-1.5.4.tar.gz
 "