diff --git a/dev-python/s3transfer/metadata.xml b/dev-python/s3transfer/metadata.xml
index 35fd9d51f663e..3e6df16d35d12 100644
--- a/dev-python/s3transfer/metadata.xml
+++ b/dev-python/s3transfer/metadata.xml
@@ -3,9 +3,11 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="pypi">s3transfer</remote-id>
-	</upstream>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/s3transfer/s3transfer-0.1.1.ebuild b/dev-python/s3transfer/s3transfer-0.1.1.ebuild
index eb56624064c12..7ad1e5c011db0 100644
--- a/dev-python/s3transfer/s3transfer-0.1.1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.1.1.ebuild
@@ -4,22 +4,35 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
-DESCRIPTION="Amazon S3 Transfer Manager"
-HOMEPAGE="http://pypi.python.org/pypi/s3transfer"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
 
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
+CDEPEND="
+	>=dev-python/botocore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/botocore-2.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '<dev-python/futures-4.0.0[${PYTHON_USEDEP}]' 'python2_7')
 "
-DEPEND="${RDEPEND}
+# Pin mock to 1.3.0 if testing failures due to mock occur.
+DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
+	test? (
+		${CDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	nosetests tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
+}