diff --git a/dev-scheme/cyclone/cyclone-0.28.0.ebuild b/dev-scheme/cyclone/cyclone-0.28.0.ebuild
index e7a88f4ff7..5e03406476 100644
--- a/dev-scheme/cyclone/cyclone-0.28.0.ebuild
+++ b/dev-scheme/cyclone/cyclone-0.28.0.ebuild
@@ -4,7 +4,7 @@
 # Cyclone is a self-hosting Scheme to C compiler
 # cyclone-bootstrap is the Cyclone SOURCE transpiled by it to C
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
@@ -23,12 +23,8 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-DEPEND="
-	dev-libs/concurrencykit
-"
-RDEPEND="
-	${DEPEND}
-"
+DEPEND="dev-libs/concurrencykit"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	export CYC_GCC_OPT_FLAGS="${CFLAGS}"
@@ -37,10 +33,6 @@ src_configure() {
 	tc-export AR CC RANLIB
 }
 
-src_test() {
-	emake test LDFLAGS=""
-}
-
 src_compile() {
 	local myopts=(
 		PREFIX="${EPREFIX}/usr"
@@ -52,6 +44,10 @@ src_compile() {
 	emake "${myopts[@]}"
 }
 
+src_test() {
+	emake LDFLAGS="" test
+}
+
 src_install() {
 	einstalldocs
 
diff --git a/dev-scheme/cyclone/cyclone-9999.ebuild b/dev-scheme/cyclone/cyclone-9999.ebuild
index e7a88f4ff7..5e03406476 100644
--- a/dev-scheme/cyclone/cyclone-9999.ebuild
+++ b/dev-scheme/cyclone/cyclone-9999.ebuild
@@ -4,7 +4,7 @@
 # Cyclone is a self-hosting Scheme to C compiler
 # cyclone-bootstrap is the Cyclone SOURCE transpiled by it to C
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
@@ -23,12 +23,8 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-DEPEND="
-	dev-libs/concurrencykit
-"
-RDEPEND="
-	${DEPEND}
-"
+DEPEND="dev-libs/concurrencykit"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	export CYC_GCC_OPT_FLAGS="${CFLAGS}"
@@ -37,10 +33,6 @@ src_configure() {
 	tc-export AR CC RANLIB
 }
 
-src_test() {
-	emake test LDFLAGS=""
-}
-
 src_compile() {
 	local myopts=(
 		PREFIX="${EPREFIX}/usr"
@@ -52,6 +44,10 @@ src_compile() {
 	emake "${myopts[@]}"
 }
 
+src_test() {
+	emake LDFLAGS="" test
+}
+
 src_install() {
 	einstalldocs