diff -u -B -u -r1.3 pysize-0.2-r1.ebuild
--- pysize-0.2-r1.ebuild	12 Mar 2014 05:00:58 -0000	1.3
+++ pysize-0.2-r1.ebuild	5 Jul 2014 03:01:54 -0000
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	gtk? ( dev-python/pygtk:2 )
 	ncurses? ( sys-libs/ncurses )"
 RDEPEND="${DEPEND}"
@@ -28,6 +28,7 @@
 	"${FILESDIR}"/psyco-${PV}-automagic.patch
 	"${FILESDIR}"/${PV}-setuptools-automagic.patch
 	)
+DISTUTILS_NO_PARALLEL_BUILD=1
 
 python_prepare_all() {
 	if ! use gtk; then
@@ -54,3 +55,15 @@
 
 	distutils-r1_python_prepare_all
 }
+
+src_test() {
+	# Tests shatter otherwise
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	pushd tests > /dev/null
+	PYTHONPATH=.:../ "${PYTHON}" pysize_tests.py || die "tests failed under ${EPYTHON}"
+	popd  > /dev/null
+}