diff --git a/dev-python/flask-babel/flask-babel-0.9.ebuild b/dev-python/flask-babel/flask-babel-0.9.ebuild
index f1c3a5091ccb5..dc2cc8fc0b3c4 100644
--- a/dev-python/flask-babel/flask-babel-0.9.ebuild
+++ b/dev-python/flask-babel/flask-babel-0.9.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=( python{2_7,3_3,3_4} pypy )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1
 
@@ -11,21 +11,26 @@ MY_PN="Flask-Babel"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
-HOMEPAGE="http://packages.python.org/Flask-Babel/"
+HOMEPAGE="https://pythonhosted.org/Flask-Babel/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+IUSE="test"
+# https://github.com/python-babel/flask-babel/issues/87
+RESTRICT="test"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/Babel[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/flask-babel/metadata.xml b/dev-python/flask-babel/metadata.xml
index 7d703bc571ef2..ee71c5b56de20 100644
--- a/dev-python/flask-babel/metadata.xml
+++ b/dev-python/flask-babel/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Babel</remote-id>
+		<remote-id type="github">python-babel/flask-babel</remote-id>
+		<bugs-to>https://github.com/python-babel/flask-babel/issues</bugs-to>
 	</upstream>
 </pkgmetadata>