diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4
index 644bf71..9343bc2 100644
--- a/m4/check-os-options.m4
+++ b/m4/check-os-options.m4
@@ -112,7 +112,7 @@ char buf[1]; getentropy(buf, 1);
 		CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS"
 		CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600"
 		CPPFLAGS="$CPPFLAGS"
-		AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt'])
+		AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt -lssp'])
 		;;
 	*solaris*)
 		HOST_OS=solaris
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8ce338f..f43bd85 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -172,9 +172,11 @@ check_PROGRAMS += dsatest
 dsatest_SOURCES = dsatest.c
 
 # dtlstest
+if !HOST_WIN
 TESTS += dtlstest.sh
 check_PROGRAMS += dtlstest
 dtlstest_SOURCES = dtlstest.c
+endif
 EXTRA_DIST += dtlstest.sh
 
 # ec_point_conversion