diff --git a/app-admin/kedpm/kedpm-0.4.0-r1.ebuild b/app-admin/kedpm/kedpm-0.4.0-r1.ebuild
index 11c6aac..afe6aff 100644
--- a/app-admin/kedpm/kedpm-0.4.0-r1.ebuild
+++ b/app-admin/kedpm/kedpm-0.4.0-r1.ebuild
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_DEPEND="2"
 inherit distutils eutils
 
 DESCRIPTION="Ked Password Manager helps to manage large amounts of passwords and related information"
@@ -17,10 +21,7 @@ DEPEND=">=sys-apps/sed-4"
 RDEPEND="dev-python/pycrypto
 	gtk? ( >=dev-python/pygtk-2 )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# We want documentation to install in /usr/share/doc/kedpm
 	# not in /usr/share/kedpm as in original setup.py.
 	epatch "${FILESDIR}/setup-doc.patch"
@@ -38,5 +39,8 @@ src_install() {
 }
 
 src_test() {
-	./run_tests || die "tests failed"
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" ./run_tests
+	}
+	python_execute_function testing
 }