diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index c553ec4c87..426a1543a5 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,2 +1 @@
-DIST testssl-3.0_rc5.tar.gz 9181084 BLAKE2B e803f6600c777368dabb55f1107d48573d943b5514b919e39dae337ec7ed3920ae4f610f3c5761a93e396f2206c68d5801374da7381d5f750c6537f6bf2bc307 SHA512 2ac175801e3242484d3b882ed49a3cdb7ea7613a4e3fe086b2cb94397decd8465e18db2e83a215b4a49d672d03c7b818ba689a40e7a4d69688e9a691a8722014
-DIST testssl-3.0_rc6.tar.gz 9198338 BLAKE2B 5f306f78480ff221ba5b0f917ae4d3b8b05cf17c23891802b1eadc184be8a7f9e3c400bf66ac3651030260d084741ece2302cb67f8611308bebf78dd45ffa9c9 SHA512 df019387a73f92200557c66008d4b8619f7a0dfe90971a400db6fba5c6ba3b37ef505dc98351e58e484a31f224b991f11ac8b05a8b6be68f28b99e92618fe79b
+DIST testssl-3.0.tar.gz 9207778 BLAKE2B 56f13cb58bc930e0c70ef1ff4734dd7e363f362397ebe354c446f1fd6e73a0774a6eb84326a405a5aab224b058754e03fcecda254617eee2fde4d9566ada4e15 SHA512 a5e65d3145bc422cf03b49087cc24cadca367206a06dda61d114b0a6afd7c4921204e23cdc3ade2f5d7e9ce4adf17b54691b9d33d46b75b296111663e9cf063a
diff --git a/net-analyzer/testssl/testssl-3.0_rc5-r1.ebuild b/net-analyzer/testssl/testssl-3.0.ebuild
similarity index 88%
rename from net-analyzer/testssl/testssl-3.0_rc5-r1.ebuild
rename to net-analyzer/testssl/testssl-3.0.ebuild
index 6c51fa3a80..2f7c491874 100644
--- a/net-analyzer/testssl/testssl-3.0_rc5-r1.ebuild
+++ b/net-analyzer/testssl/testssl-3.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-MY_PV="${PV/_rc/rc}"
+#MY_PV="${PV/_rc/rc}"
 
 DESCRIPTION="Tool to check TLS/SSL cipher support"
 HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/testssl.sh/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/drwetter/testssl.sh/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
@@ -28,7 +28,7 @@ RDEPEND="
 	)
 	!bundled-openssl? ( dev-libs/openssl-bad )"
 
-S="${WORKDIR}/testssl.sh-${MY_PV}"
+S="${WORKDIR}/testssl.sh-${PV}"
 
 QA_PREBUILT="opt/${PN}/*"
 
diff --git a/net-analyzer/testssl/testssl-3.0_rc6.ebuild b/net-analyzer/testssl/testssl-3.0_rc6.ebuild
deleted file mode 100644
index 6c51fa3a80..0000000000
--- a/net-analyzer/testssl/testssl-3.0_rc6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_rc/rc}"
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/testssl.sh/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bundled-openssl kerberos"
-
-RDEPEND="
-	app-shells/bash[net]
-	net-dns/bind-tools
-	sys-apps/util-linux
-	sys-libs/ncurses:0
-	sys-process/procps
-	bundled-openssl? (
-		kerberos? (
-			sys-libs/zlib
-			virtual/krb5
-		)
-	)
-	!bundled-openssl? ( dev-libs/openssl-bad )"
-
-S="${WORKDIR}/testssl.sh-${MY_PV}"
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
-	if use amd64; then
-		if use kerberos; then
-			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
-		else
-			BUNDLED_OPENSSL="openssl.Linux.x86_64"
-		fi
-	elif use x86; then
-		BUNDLED_OPENSSL="openssl.Linux.i686"
-	fi
-}
-
-src_prepare() {
-	sed -i ${PN}.sh \
-		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
-		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
-
-	if use bundled-openssl; then
-		sed -i ${PN}.sh \
-			-e "s|OPENSSL=\"\$1/openssl\"|OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"|" || die
-	else
-		sed -i ${PN}.sh \
-			-e 's|OPENSSL="$1/openssl"|OPENSSL="$1/openssl-bad"|' || die
-	fi
-
-	default
-}
-
-src_install() {
-	dodoc CHANGELOG.md CREDITS.md Readme.md
-	dodoc openssl-iana.mapping.html
-
-	dobin ${PN}.sh
-
-	insinto /etc/${PN}
-	doins etc/*
-
-	if use bundled-openssl; then
-		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
-	fi
-}