diff --git a/.appveyor.yml b/.appveyor.yml
index f6830687c..0ff94fc83 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -29,6 +29,8 @@ install:
       IF "%IMG%" == "2017" set OPENSSL=OpenSSL-v11
       set OPENSSL_DIR=/c/%OPENSSL%-%TEST%
       C:\%OPENSSL%-%TEST%\bin\openssl.exe version -a
+  # lld doesn't read .lib files
+  - IF NOT "%IMG%" == "2015" copy C:\%OPENSSL%-%TEST%\lib\libcrypto.lib C:\%OPENSSL%-%TEST%\lib\libcrypto.dll.a
   # newer versions of msys2 don't provide autotools or gperf via base-devel anymore
   - IF "%IMG%" == "2019" %MSYS_SH% --login -c ". /etc/profile && pacman --noconfirm -S --needed autotools gperf"
 
diff --git a/scripts/test.sh b/scripts/test.sh
index f5cbd1ce6..dc321b127 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -352,7 +352,7 @@ win*)
 	else
 		CONFIG="$CONFIG --enable-openssl"
 		CFLAGS="$CFLAGS -I$OPENSSL_DIR/include"
-		LDFLAGS="-L$OPENSSL_DIR/lib"
+		LDFLAGS="-L$OPENSSL_DIR/lib -fuse-ld=lld"
 		case "$IMG" in
 		2015)
 			# gcc/ld might be too old to find libeay32 via .lib instead of .dll
@@ -543,7 +543,7 @@ apidoc)
 	;;
 esac
 
-echo "$ make $TARGET"
+echo "$ make -j$(nproc) $TARGET"
 case "$TEST" in
 sonarcloud)
 	# without target, coverage is currently not supported anyway because