diff --git a/srcpkgs/python-jupyter_client/template b/srcpkgs/python-jupyter_client/template
deleted file mode 100644
index 6365dd9e175..00000000000
--- a/srcpkgs/python-jupyter_client/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-jupyter_client'
-pkgname=python-jupyter_client
-version=5.2.4
-revision=2
-archs=noarch
-wrksrc="jupyter_client-${version}"
-build_style=python-module
-pycompile_module="jupyter_client"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-traitlets python-jupyter_core
- python-pyzmq python-dateutil python-tornado python-simplejson"
-short_desc="Jupyter protocol client APIs (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/jupyter/jupyter_client"
-distfiles="${PYPI_SITE}/j/jupyter_client/jupyter_client-${version}.tar.gz"
-checksum=b5f9cb06105c1d2d30719db5ffb3ea67da60919fb68deaefa583deccd8813551
-alternatives="
- jupyter-client:jupyter-kernel:/usr/bin/jupyter-kernel2
- jupyter-client:jupyter-kernelspec:/usr/bin/jupyter-kernelspec2
- jupyter-client:jupyter-run:/usr/bin/jupyter-run2"
-
-post_install() {
-	vlicense COPYING.md LICENSE
-}
-
-python3-jupyter_client_package() {
-	archs=noarch
-	pycompile_module="jupyter_client"
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3-setuptools python3-traitlets python3-jupyter_core
-	 python3-pyzmq python3-dateutil python3-tornado python3-simplejson"
-	alternatives="
-	 jupyter-client:jupyter-kernel:/usr/bin/jupyter-kernel3
-	 jupyter-client:jupyter-kernelspec:/usr/bin/jupyter-kernelspec3
-	 jupyter-client:jupyter-run:/usr/bin/jupyter-run3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense COPYING.md LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jupyter_client b/srcpkgs/python3-jupyter_client
deleted file mode 120000
index 1bbcedc9a15..00000000000
--- a/srcpkgs/python3-jupyter_client
+++ /dev/null
@@ -1 +0,0 @@
-python-jupyter_client
\ No newline at end of file
diff --git a/srcpkgs/python3-jupyter_client/patches/test_session.patch b/srcpkgs/python3-jupyter_client/patches/test_session.patch
new file mode 100644
index 00000000000..2febffe28cf
--- /dev/null
+++ b/srcpkgs/python3-jupyter_client/patches/test_session.patch
@@ -0,0 +1,15 @@
+encoding option is removed from msgpack.unpackb
+See: https://pypi.org/project/msgpack/
+diff --git jupyter_client/tests/test_session.py jupyter_client/tests/test_session.py
+index 82d63df..d8636ff 100644
+--- jupyter_client/tests/test_session.py
++++ jupyter_client/tests/test_session.py
+@@ -311,7 +311,7 @@ class TestSession(SessionTestCase):
+ 
+         session = ss.Session(
+             pack=msgpack.packb,
+-            unpack=lambda buf: msgpack.unpackb(buf, encoding='utf8'),
++            unpack=lambda buf: msgpack.unpackb(buf),
+         )
+         self._datetime_test(session)
+ 
diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template
new file mode 100644
index 00000000000..ed8ea565883
--- /dev/null
+++ b/srcpkgs/python3-jupyter_client/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-jupyter_client'
+pkgname=python3-jupyter_client
+version=5.2.4
+revision=3
+archs=noarch
+wrksrc="jupyter_client-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-traitlets python3-jupyter_core
+ python3-pyzmq python3-dateutil python3-tornado python3-simplejson"
+checkdepends="$depends python3-pytest python3-ipython_ipykernel
+ python3-msgpack python3-Sphinx"
+short_desc="Jupyter protocol client APIs"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter/jupyter_client"
+distfiles="${PYPI_SITE}/j/jupyter_client/jupyter_client-${version}.tar.gz"
+checksum=b5f9cb06105c1d2d30719db5ffb3ea67da60919fb68deaefa583deccd8813551
+conflicts="python-jupyter_client<=5.2.4_2"
+
+do_check() {
+	pytest -k 'not test_install_kernel_spec_prefix'
+}
+
+post_install() {
+	vlicense COPYING.md LICENSE
+}