diff --git a/configure.ac b/configure.ac
index 8fb048e581..541a5877d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1169,7 +1169,7 @@ if test x$openssl = xtrue; then
 	if test "x$windows" = xtrue; then
 		openssl_lib=eay32
 		AC_CHECK_LIB([$openssl_lib],[EVP_CIPHER_CTX_new],[LIBS="$LIBS"],
-			[AC_MSG_RESULT([no]);openssl_lib=""],[$DLLIB])
+			[openssl_lib=""],[$DLLIB])
 	fi
 	if test -z "$openssl_lib"; then
 		openssl_lib=crypto
diff --git a/scripts/test.sh b/scripts/test.sh
index 5e15f0af84..6b2e8caa12 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -286,17 +286,23 @@ win*)
 	if test "$APPVEYOR" != "True"; then
 		TARGET=
 	else
+		CONFIG="$CONFIG --enable-openssl"
 		case "$IMG" in
 		2015|2017)
 			# old OpenSSL versions don't provide HKDF
 			CONFIG="$CONFIG --enable-kdf"
 			;;
 		esac
-		CONFIG="$CONFIG --enable-openssl"
-		CFLAGS="$CFLAGS -I$OPENSSL_DIR/include"
-		LDFLAGS="-L$OPENSSL_DIR"
-		export LDFLAGS
 
+		CFLAGS="$CFLAGS -I$OPENSSL_DIR/include"
+		LDFLAGS="-L$OPENSSL_DIR/lib"
+		case "$IMG" in
+		2015)
+			# gcc/ld might be too old to find libeay32 via .lib instead of .dll
+			LDFLAGS="-L$OPENSSL_DIR"
+			;;
+		esac
+		export LDFLAGS
 	fi
 	CFLAGS="$CFLAGS -mno-ms-bitfields"
 	DEPS="gcc-mingw-w64-base"