diff --git a/dev-python/speaklater/metadata.xml b/dev-python/speaklater/metadata.xml
index 28a065d31f76e..f4503d2e5e21d 100644
--- a/dev-python/speaklater/metadata.xml
+++ b/dev-python/speaklater/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">speaklater</remote-id>
     <remote-id type="github">mitsuhiko/speaklater</remote-id>
+    <bugs-to>https://github.com/mitsuhiko/speaklater/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
index a02509c16ff5e..f59954ca7df83 100644
--- a/dev-python/speaklater/speaklater-1.3-r1.ebuild
+++ b/dev-python/speaklater/speaklater-1.3-r1.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
 
 DESCRIPTION="Lazy strings for Python"
@@ -17,3 +17,17 @@ IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
+
+python_prepare() {
+	# https://github.com/mitsuhiko/speaklater/issues/2
+	if python_is_python3; then
+		2to3 -n -w --no-diffs ${PN}.py || die
+		2to3 -d -n -w --no-diffs ${PN}.py || die
+		# fix unicode in doctests
+		sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die
+	fi
+}
+
+python_test() {
+	"${PYTHON}" -m doctest -v ${PN}.py || die "tests failed with ${EPYTHON}"
+}