diff --git a/app-forensics/s3tk/Manifest b/app-forensics/s3tk/Manifest
index 3fae10a0f..acba580ea 100644
--- a/app-forensics/s3tk/Manifest
+++ b/app-forensics/s3tk/Manifest
@@ -1 +1 @@
-DIST s3tk-0.2.0.tar.gz 11708 BLAKE2B 201f936e20e15c05e353d4b802547cd3ca0de80b265c0a11cdd49b54a61d22e694148058c5236a9ded09e53cc98632981401f15174e11516738c814eaec1ee6a SHA512 b439ef023eec2a39da995bde9affc27b34227ac67b892adf574dcccd2229b93571115845b857beb44d3b9a98c4fd8314fb860939f583e5fffdffb167e449dcea
+DIST s3tk-0.3.0.tar.gz 12443 BLAKE2B ece85094d8165bf916ada7768926fa8908fd301cd37ad9506cee2f72e17b188dff6cf92d2aeab500ac063e8d50ea771bb5bd08193a6f54e2bcbc5d766e357c28 SHA512 57489b5e793da49f3436ca4727a7ab1596f79828ffc295a644ae3333983b1cc593cc32e61505047a4ace064e979d81b8b053f69defb091417e373e047d0755a6
diff --git a/app-forensics/s3tk/s3tk-0.2.0.ebuild b/app-forensics/s3tk/s3tk-0.3.0.ebuild
similarity index 72%
rename from app-forensics/s3tk/s3tk-0.2.0.ebuild
rename to app-forensics/s3tk/s3tk-0.3.0.ebuild
index cf7fe2e24..11d2f78f2 100644
--- a/app-forensics/s3tk/s3tk-0.2.0.ebuild
+++ b/app-forensics/s3tk/s3tk-0.3.0.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
 DESCRIPTION="A security toolkit for Amazon S3"
 HOMEPAGE="https://github.com/ankane/s3tk"
-LICENSE="MIT"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -19,14 +18,21 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-SLOT=0
-DOCS=( CHANGELOG.md README.md )
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
 
 DEPEND="${PYTHON_DEPS}
 	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
 	dev-python/clint[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
+	dev-python/joblib[${PYTHON_USEDEP}]"
 
 RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
diff --git a/app-forensics/s3tk/s3tk-9999.ebuild b/app-forensics/s3tk/s3tk-9999.ebuild
index cf7fe2e24..11d2f78f2 100644
--- a/app-forensics/s3tk/s3tk-9999.ebuild
+++ b/app-forensics/s3tk/s3tk-9999.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
 DESCRIPTION="A security toolkit for Amazon S3"
 HOMEPAGE="https://github.com/ankane/s3tk"
-LICENSE="MIT"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -19,14 +18,21 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-SLOT=0
-DOCS=( CHANGELOG.md README.md )
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
 
 DEPEND="${PYTHON_DEPS}
 	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
 	dev-python/clint[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
+	dev-python/joblib[${PYTHON_USEDEP}]"
 
 RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest