diff --git a/dev-python/flask-testing/flask-testing-0.4.2.ebuild b/dev-python/flask-testing/flask-testing-0.4.2.ebuild
index c9c8d52790310..25849795db362 100644
--- a/dev-python/flask-testing/flask-testing-0.4.2.ebuild
+++ b/dev-python/flask-testing/flask-testing-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 
 inherit distutils-r1
 
@@ -20,18 +20,17 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/twill[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep 'dev-python/twill[${PYTHON_USEDEP}]' python2_7)"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
+		${RDEPEND}
 		dev-python/blinker[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 	)"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=( "${FILESDIR}"/${PV}-test-fix.patch )
 
 python_test() {
-	# test phase appears to run only py2.7 but if it passes for py2.7 is passes for pypy
-	nosetests || die "Testing failed with ${EPYTHON}"
+	esetup.py test
 }
diff --git a/dev-python/flask-testing/metadata.xml b/dev-python/flask-testing/metadata.xml
index d2f55a2981448..186145be8e10f 100644
--- a/dev-python/flask-testing/metadata.xml
+++ b/dev-python/flask-testing/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Testing</remote-id>
+		<remote-id type="github">jarus/flask-testing</remote-id>
+		<bugs-to>https://github.com/jarus/flask-testing/issues</bugs-to>
 	</upstream>
 </pkgmetadata>