diff --git a/dev-python/impacket/impacket-9999.ebuild b/dev-python/impacket/impacket-9999.ebuild
index dce93d875..3315904bc 100644
--- a/dev-python/impacket/impacket-9999.ebuild
+++ b/dev-python/impacket/impacket-9999.ebuild
@@ -1,35 +1,38 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
-PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A collection of Python classes focused on providing access to network packets"
 HOMEPAGE="https://github.com/CoreSecurity/impacket"
-if [[ ${PV} == "9999" ]] ; then
+
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/CoreSecurity/impacket.git"
-	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/CoreSecurity/impacket"
 else
 	SRC_URI="https://github.com/CoreSecurity/impacket/archive/impacket_${PV//./_}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${PN}_${PV//./_}
+
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${PN}_${PV//./_}"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
-RDEPEND=">=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
-	|| ( dev-python/pycryptodomex[${PYTHON_USEDEP}] )
-	>=dev-python/pyopenssl-0.16.2[${PYTHON_USEDEP}]
+RDEPEND="${PYTHON_DEPS}
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/ldap3-2.5.1[${PYTHON_USEDEP}]
 	dev-python/ldapdomaindump[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]"
+	dev-python/pycryptodomex[${PYTHON_USEDEP}]"
+
 DEPEND="${RDEPEND}"
 
 python_prepare_all() {
@@ -39,14 +42,6 @@ python_prepare_all() {
 }
 
 python_test() {
-	pushd impacket/testcases/dot11
-	for test in $(ls *.py); do
-		${PYTHON} ${test} || die "Tests fail with ${EPYTHON}"
-	done
-	popd
-	pushd impacket/testcases/ImpactPacket
-	for test in $(ls *.py); do
-		${PYTHON} ${test} || die "Tests fail with ${EPYTHON}"
-	done
-	popd
+	cd tests || die
+	./runall.sh || die
 }
diff --git a/dev-python/impacket/metadata.xml b/dev-python/impacket/metadata.xml
new file mode 100644
index 000000000..4fa8ff351
--- /dev/null
+++ b/dev-python/impacket/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>