diff --git a/sci-libs/jdqz/files/makefile.patch b/sci-libs/jdqz/files/makefile.patch
index 626af346d1..58a350cd9e 100644
--- a/sci-libs/jdqz/files/makefile.patch
+++ b/sci-libs/jdqz/files/makefile.patch
@@ -1,6 +1,5 @@
-diff -ur a/jdlib/Makefile b/jdlib/Makefile
---- a/jdlib/Makefile	1996-08-23 10:50:41.000000000 +0200
-+++ b/jdlib/Makefile	2020-04-28 20:06:19.373359811 +0200
+--- a/jdlib/Makefile
++++ b/jdlib/Makefile
 @@ -2,21 +2,18 @@
  #     Coded by Diederik R. Fokkema
  #
@@ -31,9 +30,8 @@ diff -ur a/jdlib/Makefile b/jdlib/Makefile
 -	$(FC) -u -O1 -c jdqz.f
 -	$(AR) rv $(LIB) jdqz.o
 -	-rm jdqz.o
-diff -ur a/jdtest/Makefile b/jdtest/Makefile
---- a/jdtest/Makefile	1996-09-02 10:13:34.000000000 +0200
-+++ b/jdtest/Makefile	2020-04-28 20:12:09.021605638 +0200
+--- a/jdtest/Makefile
++++ b/jdtest/Makefile
 @@ -1,13 +1,10 @@
 -FC = f77
 -FFLAGS = -u -O
@@ -50,9 +48,8 @@ diff -ur a/jdtest/Makefile b/jdtest/Makefile
  
  clean:
  	-rm -f example
-diff -ur a/Makefile b/Makefile
---- a/Makefile	1996-08-23 10:47:42.000000000 +0200
-+++ b/Makefile	2020-04-28 20:13:35.101159047 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,14 +1,11 @@
 -FC = f77
 -FFLAGS = -u -O
diff --git a/sci-libs/jdqz/jdqz-0_pre19971107-r2.ebuild b/sci-libs/jdqz/jdqz-0_pre19971107-r2.ebuild
index a6ca7f0f06..89760e5b23 100644
--- a/sci-libs/jdqz/jdqz-0_pre19971107-r2.ebuild
+++ b/sci-libs/jdqz/jdqz-0_pre19971107-r2.ebuild
@@ -6,31 +6,29 @@ EAPI="7"
 inherit flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Jacobi-Davidson type method for the generalized standard eigenvalue problem."
-HOMEPAGE="https://www.win.tue.nl/~hochsten/jd/"
+HOMEPAGE="https://www.win.tue.nl/~hochsten/jd"
 SRC_URI="https://www.win.tue.nl/~hochsten/jd/${PN}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc"
+IUSE="doc test"
 
 # virtual/lapack does not pull in [deprecated] so we have to deal with this mess like this until it does
 DEPEND="
 	virtual/blas
 	virtual/lapack
-	|| ( sci-libs/openblas sci-libs/lapack[deprecated(-)] )
+	|| ( sci-libs/openblas !sci-libs/lapack[-deprecated(-)] )
 "
 RDEPEND="${DEPEND}"
 BDEPEND="doc? ( dev-texlive/texlive-latex )"
 
 PATCHES=( "${FILESDIR}/makefile.patch" )
-
-S="${WORKDIR}/${PN}"
+RESTRICT="!test? ( test )"
 
 src_prepare() {
-	libs="$($(tc-getPKG_CONFIG) --libs blas)"
-	libs+=" $($(tc-getPKG_CONFIG) --libs lapack)"
-	append-fflags "${libs}"
+	append-fflags "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)"
 	default
 }
 
@@ -48,7 +46,7 @@ src_test() {
 	pushd "jdtest" || die
 	emake
 	popd || die
-	LD_LIBRARY_PATH="./jdlib" ./jdtest/example || die
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:./jdlib" ./jdtest/example || die
 }
 
 src_install() {