diff --git a/dev-cpp/identiconpp/identiconpp-0.7.1.ebuild b/dev-cpp/identiconpp/identiconpp-0.7.1.ebuild
index b7097f0..71ec7bb 100644
--- a/dev-cpp/identiconpp/identiconpp-0.7.1.ebuild
+++ b/dev-cpp/identiconpp/identiconpp-0.7.1.ebuild
@@ -16,17 +16,16 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	SRC_URI="https://schlomp.space/tastytea/identiconpp/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ "${PV}" == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="doc examples test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	media-gfx/imagemagick[png,cxx]
 "
@@ -37,10 +36,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-fi
-
 src_prepare() {
 	if use doc; then
 		HTML_DOCS="doc/html/*"
diff --git a/dev-cpp/identiconpp/identiconpp-0.7.2.ebuild b/dev-cpp/identiconpp/identiconpp-0.7.2.ebuild
index b7097f0..71ec7bb 100644
--- a/dev-cpp/identiconpp/identiconpp-0.7.2.ebuild
+++ b/dev-cpp/identiconpp/identiconpp-0.7.2.ebuild
@@ -16,17 +16,16 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	SRC_URI="https://schlomp.space/tastytea/identiconpp/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ "${PV}" == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="doc examples test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	media-gfx/imagemagick[png,cxx]
 "
@@ -37,10 +36,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-fi
-
 src_prepare() {
 	if use doc; then
 		HTML_DOCS="doc/html/*"
diff --git a/dev-cpp/identiconpp/identiconpp-9999.ebuild b/dev-cpp/identiconpp/identiconpp-9999.ebuild
index b7097f0..71ec7bb 100644
--- a/dev-cpp/identiconpp/identiconpp-9999.ebuild
+++ b/dev-cpp/identiconpp/identiconpp-9999.ebuild
@@ -16,17 +16,16 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	SRC_URI="https://schlomp.space/tastytea/identiconpp/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ "${PV}" == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="doc examples test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	media-gfx/imagemagick[png,cxx]
 "
@@ -37,10 +36,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-fi
-
 src_prepare() {
 	if use doc; then
 		HTML_DOCS="doc/html/*"