diff --git a/dev-python/mccabe/mccabe-0.4.0.ebuild b/dev-python/mccabe/mccabe-0.4.0.ebuild
index 4eeee85e31de0..035d0cc667adc 100644
--- a/dev-python/mccabe/mccabe-0.4.0.ebuild
+++ b/dev-python/mccabe/mccabe-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,12 +6,10 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
-RESTRICT="test"
-
 inherit distutils-r1
 
-DESCRIPTION="a plugin for flake8"
-HOMEPAGE="https://github.com/flintwork/mccabe"
+DESCRIPTION="flake8 plugin: McCabe complexity checker"
+HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -19,11 +17,15 @@ IUSE="test"
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND=">=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pytest-runner[${PYTHON_USEDEP}]"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
 
 python_test() {
-	${EPYTHON} test_mccabe.py || die
+	py.test -v || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-python/mccabe/metadata.xml b/dev-python/mccabe/metadata.xml
index 25144a574b702..4e85351888069 100644
--- a/dev-python/mccabe/metadata.xml
+++ b/dev-python/mccabe/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">mccabe</remote-id>
-    <remote-id type="github">flintwork/mccabe</remote-id>
+    <remote-id type="github">PyCQA/mccabe</remote-id>
   </upstream>
 </pkgmetadata>