diff --git a/dev-python/asyncpg/asyncpg-0.20.1.ebuild b/dev-python/asyncpg/asyncpg-0.20.1.ebuild
index 839b68ebb2..146d3be46b 100644
--- a/dev-python/asyncpg/asyncpg-0.20.1.ebuild
+++ b/dev-python/asyncpg/asyncpg-0.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -11,14 +11,21 @@ DESCRIPTION="A fast PostgreSQL Database Client Library for Python/asyncio."
 HOMEPAGE="https://github.com/MagicStack/asyncpg"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# ModuleNotFoundError: No module named 'asyncpg.protocol.protocol'
+# tests seem to require that the package is already installed,
+# PYTHONPATH workaround does not seem to work here
+RESTRICT="test"
+
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
-DEPEND="test? ( dev-python/pycodestyle[${PYTHON_USEDEP}]
-                dev-python/flake8[${PYTHON_USEDEP}]
-                dev-python/uvloop[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/uvloop[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx_rtd_theme