diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
index 311a994271d3c..ccbb4f5969945 100644
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-#CMAKE_MAKEFILE_GENERATOR="emake"
 inherit cmake
 
 DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
@@ -13,18 +12,20 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lapacke doc eselect-ldso test"
 # TODO: static-libs 64bit-index
+IUSE="lapacke doc eselect-ldso test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
-	>=app-eselect/eselect-lapack-0.2 )
 	!app-eselect/eselect-cblas
 	virtual/fortran
+	eselect-ldso? (
+		>=app-eselect/eselect-blas-0.2
+		>=app-eselect/eselect-lapack-0.2
+	)
 	doc? ( app-doc/blas-docs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.9.0-build-tests.patch"
@@ -35,7 +36,7 @@ src_configure() {
 		-DCBLAS=ON
 		-DLAPACKE=$(usex lapacke)
 		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING=ON
+		-DBUILD_TESTING=$(usex test)
 	)
 
 	cmake_src_configure