diff --git a/dev-python/pysonos/Manifest b/dev-python/pysonos/Manifest
index 328f59175..291259e6c 100644
--- a/dev-python/pysonos/Manifest
+++ b/dev-python/pysonos/Manifest
@@ -1,11 +1,11 @@
 DIST pysonos-0.0.10.tar.gz 658373 BLAKE2B 31c4bce3fe913a122280ea7d1408e8bd5f1a2ff3bb3a3df8cf2cf9f2647dd7d6ee906657dd8d71adc67106ea562b9e6c6f685a78a6156023686f2f1f3a7534c3 SHA512 320d8624927ae8bca1fae9451ed68515b9a563ca77fd868fef07fc5da4dfa816c7a84db6bad48478aba15c413f41a2e862a50cde0eb18999909419fd537dcfd4
 DIST pysonos-0.0.11.tar.gz 658907 BLAKE2B 23a5b2ab97bc7c50e3589586c92dcdc25cd0551bb12e0fa16348e6898dea58f605eee4e47ff5a83bb966d00a2199dbbafcf1d8bcb7a3347b7bd710c875c0bc67 SHA512 663f3917dee16318ba4bf0c7eb44f842767d02d1ad6f93e56e6669bfc4821006b470e80748268ca8b91104fec4a0411b3c213e0d1a256d3ce55cfcbcfd580e06
-DIST pysonos-0.0.7.tar.gz 658299 BLAKE2B 8941baa5e719886f47db4fa385af1c86481c55b2a5f9f16ce47d2bcc5f8e68f4e244919401c78e19c08cf6468e13a269fb13a867f64ca4fde40f341b00e309c3 SHA512 7988ba3fd5d2f7f5343b7da930acd3aa856a249e352e3716b269ef389e67b46177cef44310635e8dd3f70916023ac1d464961b2459b31b82ce90866b8a0c40fe
+DIST pysonos-0.0.12.tar.gz 658932 BLAKE2B 13d542536fecda64c52275d25787b8923f385c94e527da119be7703d2ac1f6aab0d19b5294bc031387c5bbb685b89f50f2a0a40b1b5390c39c01782f686b4ef1 SHA512 2866915ce0b4585814d2b97974e2528bfbd1c53ebb6882521382a604be78f132ab4be98e6de9d6ba604898c8f23dfe7adbf136d4514495225adea34d1b50a3ce
 DIST pysonos-0.0.8.tar.gz 658187 BLAKE2B fa71fc3a1fe1aea9ba8fc0b4ee1e5ff4d5a90e1dd2939a38b3caf92f0c0278e48e1bd156852c1f6d289fca064fe6c1aae7655e0bca89c4f3b6f38784c4097184 SHA512 0fc926102e57d0c86f0c20b12eaf6a5cbce350b23b69ea7992f69fa8f7cb375a15417d8dcc2bb2a40c476d9f65e0dce4e28ea87f4959e986d56ec30db0099367
 DIST pysonos-0.0.9.tar.gz 658425 BLAKE2B 56f81391d359c5466ac062be2529b3bafa123ea2c3b422e2353f98b2e007526fedbde0f08466f1c3979a9b48c64b5f245b39b270a1f83d2898e293d57e0d6729 SHA512 ef164dd362e073eb959d30f81714bd250be47340640eb21425280017b84802a83a1d814b815a2206891cacf65e5b8f54028de76f7c48b6fb81dc056ecb6f6aba
 EBUILD pysonos-0.0.10.ebuild 794 BLAKE2B 56d2894402de0ac489bbf7a14574034ba681d5974a6c75216db87a5f19edfbe9c24c0dfae0bfcde9684209a6b8fc3f972cbe9e3786c7b595450b0f2aee54e050 SHA512 c55112db04cf473fe99c793fd3d01afeaa789a54a95c6180a6e038b53eb4ae6c9e81852a2621d9da690324ce75442142ae4f5e204f5487ce018dcf8a5250ca28
 EBUILD pysonos-0.0.11.ebuild 794 BLAKE2B 56d2894402de0ac489bbf7a14574034ba681d5974a6c75216db87a5f19edfbe9c24c0dfae0bfcde9684209a6b8fc3f972cbe9e3786c7b595450b0f2aee54e050 SHA512 c55112db04cf473fe99c793fd3d01afeaa789a54a95c6180a6e038b53eb4ae6c9e81852a2621d9da690324ce75442142ae4f5e204f5487ce018dcf8a5250ca28
-EBUILD pysonos-0.0.7.ebuild 831 BLAKE2B 3baaed979ef2c13ef7e59d2d2a0dfcfad6b207952e77c7fd9b401a80ebefc9b81e5ad982f198c6e1b2e5ff5785915b44a61da43bbefc94f87bb218a03709f31b SHA512 55bc2e9cd39e9b5d728810c6f1a6b9e34f2ca99ecac1b7fdf695d9ae46783cb144233c08585912aa4af0f52cc9b7ff9c00cc06c7523e3f7f6bd7c6036e0b8b39
+EBUILD pysonos-0.0.12.ebuild 794 BLAKE2B 56d2894402de0ac489bbf7a14574034ba681d5974a6c75216db87a5f19edfbe9c24c0dfae0bfcde9684209a6b8fc3f972cbe9e3786c7b595450b0f2aee54e050 SHA512 c55112db04cf473fe99c793fd3d01afeaa789a54a95c6180a6e038b53eb4ae6c9e81852a2621d9da690324ce75442142ae4f5e204f5487ce018dcf8a5250ca28
 EBUILD pysonos-0.0.8.ebuild 794 BLAKE2B 56d2894402de0ac489bbf7a14574034ba681d5974a6c75216db87a5f19edfbe9c24c0dfae0bfcde9684209a6b8fc3f972cbe9e3786c7b595450b0f2aee54e050 SHA512 c55112db04cf473fe99c793fd3d01afeaa789a54a95c6180a6e038b53eb4ae6c9e81852a2621d9da690324ce75442142ae4f5e204f5487ce018dcf8a5250ca28
 EBUILD pysonos-0.0.9.ebuild 794 BLAKE2B 56d2894402de0ac489bbf7a14574034ba681d5974a6c75216db87a5f19edfbe9c24c0dfae0bfcde9684209a6b8fc3f972cbe9e3786c7b595450b0f2aee54e050 SHA512 c55112db04cf473fe99c793fd3d01afeaa789a54a95c6180a6e038b53eb4ae6c9e81852a2621d9da690324ce75442142ae4f5e204f5487ce018dcf8a5250ca28
 MISC metadata.xml 464 BLAKE2B b07b930288d7ae4c71a4d2505f9a15ebcf51326f25a3fec2363047b6e01cca30c4159da49317352c5a5a6ba38e05fd9c3fbb7927d1ca35c49127461fd154636f SHA512 c70048bb7e0a2688bbb4efad742f075a64822b2c52c2b1a5315cf96d23796dedee8943061e837b0bba8d4ebbeee7b540ed22fea537df0d3d163790cd3b5f00e9
diff --git a/dev-python/pysonos/pysonos-0.0.12.ebuild b/dev-python/pysonos/pysonos-0.0.12.ebuild
new file mode 100644
index 000000000..38b5ea4c8
--- /dev/null
+++ b/dev-python/pysonos/pysonos-0.0.12.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors Andreas Billmeier b (at) edevau.net
+# Distributed under the terms of the GNU General Public License v3.0
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A SoCo fork with fixes for Home Assistant."
+HOMEPAGE="https://github.com/amelchio/pysonos https://pypi.org/project/pysonos/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT License"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/mock[${PYTHON_USEDEP}]
+		 dev-python/ipaddress[${PYTHON_USEDEP}]"
+DEPEND="${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}
diff --git a/dev-python/pysonos/pysonos-0.0.7.ebuild b/dev-python/pysonos/pysonos-0.0.7.ebuild
deleted file mode 100644
index e79fee1b1..000000000
--- a/dev-python/pysonos/pysonos-0.0.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A SoCo fork with fixes for Home Assistant."
-HOMEPAGE="https://github.com/amelchio/pysonos"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	)
-"
-
-# Many tests fail, even on a regular tox run on a upstream clone
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} psutil/tests/__main__.py || die
-}