diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9f26c027c..1573d8bbf 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -18,6 +18,7 @@
   * bump pywilight-0.0.68
   * bump HATasmota-0.2.8
   * bump aiolip-1.1.4
+  * bump tesla-powerwall-0.3.5
 
 2021-02-09
   * bump pychromecast-8.0.0
diff --git a/dev-python/tesla-powerwall/Manifest b/dev-python/tesla-powerwall/Manifest
index 24c7b2e86..365a92eb8 100644
--- a/dev-python/tesla-powerwall/Manifest
+++ b/dev-python/tesla-powerwall/Manifest
@@ -1,13 +1,11 @@
-DIST tesla-powerwall-0.2.10.tar.gz 15491 BLAKE2B 787aba7a01dd929f1297019645ce366e5e6a150ec7427ea9cf3339a3d754079da5beaad5a41f1b8fc38eace51600ea0f130fc2456a8b3df0f5375d9693b6ffec SHA512 babbc9fe615151cd17e585c8fa092e11cdd9c374abc110dff902a6d14b068ebc6bbf22c8e85732f40facfcd7f8b0e7bc1cde51e73e64089d19a889214b24cdf4
-DIST tesla-powerwall-0.2.11.tar.gz 15498 BLAKE2B 0b4f3a715d65fa63e6661683c362ceedb6020881792a01b46f9c471713d354979a9b4729bd8b9835e53d2305eb9b2805e6fbf4406b54423adaf4e00362b945e7 SHA512 65c2c5080e30fe12f9ffe6ecc6c87197fecef1a7e02c3f3df41dd6c1d292639b9f531d04e04d3e1fb3d7563c8f825ae9dffd8f99f3f48e1d2b541fd56c78b767
 DIST tesla-powerwall-0.2.12.tar.gz 15515 BLAKE2B 2e998f444a5ef9722aa62cd4bf9ca66052544cdecd744098deb2143ee901a825bdf6f8a95ca9426121e53032e0ae8c0a0e57caea1240d99254bf700294e4847a SHA512 dee7aee336723cd45f3a7f93ec62d15f71e5346a2591f25c3f71c9b24728f4b839d3b1ec6dd1013cdcdc2679030c84b5ef9d4babdbb3f0772825f777a7b83180
 DIST tesla-powerwall-0.2.5.tar.gz 13806 BLAKE2B 57489622dde33043dcb733e88f78d80a817b4c02b51ff7891b68def609563e42b888ee2f8d6b2da9f211555ce14c1410a53e59ee60f9b8bb477855095da3d75a SHA512 39020c58d97669f7006e861f5bc4c4da023215c7be360e202c59e7f7f50b106f86e5ff5ecb3cf0091503f2ae47bbc32aebbf6f75ba67df336ecf7c3c451357c2
 DIST tesla-powerwall-0.2.8.tar.gz 15407 BLAKE2B 517d8169f5464171966b3e34a6ec7a3137c76e8e0f86163db64400a6057fac7285547752ce7d4a26a0dde7c7a8055bc26084ac53371596269801780c9e946700 SHA512 cd9719bf2ad77a58afd7c600be4a178d7edb85a56b16611309fb2beaeb76b601f88e58f681aa1d5cea8ad69eae55f98afaa37baa3081a4e0c68bca6186888f7c
 DIST tesla-powerwall-0.3.3.tar.gz 15232 BLAKE2B dcd731055330f8aaf92e775203c2a949c3a9f20c70e4e15c6a5f00dccf6a7f8e79b48eae2770a9a3b0752830ba976bbc5c18dcdd0d6983713b780b5603fd5cd0 SHA512 c1a77c7d8739990e57c5e4d00c7c794dc781c72a9ab93f077a2739220421f55b75882593bd4d76d820cbf62df19465eb9b998237422d6e310a22b6d06e7634eb
-EBUILD tesla-powerwall-0.2.10.ebuild 807 BLAKE2B b55bb7846057a5495e7ac095efa1f6082392c3a40d96a0d856416fc0bc92a8c8f106029447f19e868633fb91ed61ebe76e7633d3b944e4144bf55264ffcb6080 SHA512 8806a7eb9af702595760447ebf610401b0187ab70eaf1a70ae0235695a97aa3f755ce07189d01729c7a793bfc207557824d231e8e30da11aee966bc57ed6cd89
-EBUILD tesla-powerwall-0.2.11.ebuild 807 BLAKE2B b55bb7846057a5495e7ac095efa1f6082392c3a40d96a0d856416fc0bc92a8c8f106029447f19e868633fb91ed61ebe76e7633d3b944e4144bf55264ffcb6080 SHA512 8806a7eb9af702595760447ebf610401b0187ab70eaf1a70ae0235695a97aa3f755ce07189d01729c7a793bfc207557824d231e8e30da11aee966bc57ed6cd89
+DIST tesla-powerwall-0.3.5.tar.gz 17431 BLAKE2B a378212835eb6ea404f06ca62f3ca43486ddc179eb3ccb27ec4c3581cd3c35e52c7e66f8abfc81dec2c230c81133492ca11c5c4490f7aad9ba3ada9a9a9f8832 SHA512 94b70fd9c2a684c750a10c48b8e2c926e89727c1389d364b4d9b68fe845b64f3896185936bbee1cfeec7f51ddbbb47b973ae1b488c14b9437575db9d60b62f9a
 EBUILD tesla-powerwall-0.2.12.ebuild 940 BLAKE2B b27d937b8f94a4027b033762e42b1a282aa26058e1226238a31efc6346cdb9c6bb77dcf61ab3340b08a01f5c0216202b385b7ea1b9033e128e49b41f6fef8bf6 SHA512 b49f28b6e00d6e34895e9ffafae01452bd79bf3b6ba5ffcc2f105255936120dcab708e7585ada7682f7a2f9c9b2f7482b92207e71982b69eff73d97fe9912bd0
 EBUILD tesla-powerwall-0.2.5.ebuild 807 BLAKE2B b55bb7846057a5495e7ac095efa1f6082392c3a40d96a0d856416fc0bc92a8c8f106029447f19e868633fb91ed61ebe76e7633d3b944e4144bf55264ffcb6080 SHA512 8806a7eb9af702595760447ebf610401b0187ab70eaf1a70ae0235695a97aa3f755ce07189d01729c7a793bfc207557824d231e8e30da11aee966bc57ed6cd89
 EBUILD tesla-powerwall-0.2.8.ebuild 807 BLAKE2B b55bb7846057a5495e7ac095efa1f6082392c3a40d96a0d856416fc0bc92a8c8f106029447f19e868633fb91ed61ebe76e7633d3b944e4144bf55264ffcb6080 SHA512 8806a7eb9af702595760447ebf610401b0187ab70eaf1a70ae0235695a97aa3f755ce07189d01729c7a793bfc207557824d231e8e30da11aee966bc57ed6cd89
 EBUILD tesla-powerwall-0.3.3.ebuild 977 BLAKE2B bc3fe6947741879568ca7e62c9c1ebc256b853b51b71be745d5f1546bb27812ef332fb5e913aa8e90bb773dee8ef80a2dcced974406ab172915983b5093a2969 SHA512 dd5c43d5a1e285313ded2895dacd6060fee7c3be972e21319e9fc84b5f5c21b8618f4647967239903ab47083d1af43905272a9fb0f89388e5b99a9bc56f0023b
+EBUILD tesla-powerwall-0.3.5.ebuild 994 BLAKE2B ec7c95b337ed480daab2dba542886b1cf047ca4b2885b73e04b67735644b2e3366ac713b2941d4a897c4388a5ce7ef2a5c5fa3cede10c1337b06ae0afde14b4a SHA512 32e770d60fc207c9692f09e7d971b4e939263b4a25de233f7b87ccafc9c7abf374b5e7cbf3c0d541494665ed6014038f83fe5741e1c4b66568b8acd36b86e423
 MISC metadata.xml 334 BLAKE2B 686870dc54f3c6149f8831f20dbf0538f69effee56ccad3f5de8c0cea26362b0c204ac4c35b32c47c72d606af89aa487ab43fe1ea9e1bf07f13770412f838cab SHA512 74a3c6d28d2d892b5f4ea1cd4522393b470177ee016411c2c969b43b817982a7179fdbb40db0e80db9e6378728d0460d5b511bb394d8d88dab3bb48b462ae229
diff --git a/dev-python/tesla-powerwall/tesla-powerwall-0.2.11.ebuild b/dev-python/tesla-powerwall/tesla-powerwall-0.2.11.ebuild
deleted file mode 100644
index 6265915cb..000000000
--- a/dev-python/tesla-powerwall/tesla-powerwall-0.2.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-DESCRIPTION="API for Tesla Powerwall"
-HOMEPAGE="https://github.com/jrester/tesla_powerwall https://pypi.org/project/tesla-powerwall/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.22.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/tesla-powerwall/tesla-powerwall-0.2.10.ebuild b/dev-python/tesla-powerwall/tesla-powerwall-0.3.5.ebuild
similarity index 66%
rename from dev-python/tesla-powerwall/tesla-powerwall-0.2.10.ebuild
rename to dev-python/tesla-powerwall/tesla-powerwall-0.3.5.ebuild
index 6265915cb..f751de8e1 100644
--- a/dev-python/tesla-powerwall/tesla-powerwall-0.2.10.ebuild
+++ b/dev-python/tesla-powerwall/tesla-powerwall-0.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -17,14 +17,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
-RDEPEND=">=dev-python/requests-2.22.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
+DOCS="README.md"
+
+RDEPEND=">=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]"
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
+src_prepare() {
+	sed -i "s/packages=find_packages()/packages=find_packages(exclude=['tests*'])/g" -i setup.py || die
+	eapply_user
+}
+
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 python_test() {