diff --git a/doc/Changelog b/doc/Changelog
index 1ad6e708b..863399c18 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 25 November 2008: Wouter
 	- configure complains when --without-ssl is given (bug #220).
+	- skip unsupported feature tests on vista/mingw.
+	- fixup testcode/streamtcp to work on vista/mingw.
 
 24 November 2008: Wouter
 	- document that the user of the server daemon needs read privileges
diff --git a/testcode/do-tests.sh b/testcode/do-tests.sh
index 924897f31..7faf5c00e 100755
--- a/testcode/do-tests.sh
+++ b/testcode/do-tests.sh
@@ -8,6 +8,7 @@ NEED_NC='fwd_compress_c00c.tpkg'
 NEED_CURL='06-ianaports.tpkg'
 NEED_WHOAMI='07-confroot.tpkg'
 NEED_IPV6='fwd_ancil.tpkg fwd_tcp_tc6.tpkg'
+NEED_NOMINGW='tcp_sigpipe.tpkg 07-confroot.tpkg 08-host-lib.tpkg fwd_ancil.tpkg'
 
 # test for ipv6, uses streamptcp peculiarity.
 if ./streamtcp -f ::1 2>&1 | grep "not supported" >/dev/null 2>&1; then
@@ -16,6 +17,13 @@ else
 	HAVE_IPV6=yes
 fi
 
+# test mingw. no signals and so on.
+if uname | grep MINGW >/dev/null; then
+	HAVE_MINGW=yes
+else
+	HAVE_MINGW=no
+fi
+
 cd testdata;
 sh ../testcode/mini_tpkg.sh clean
 rm -f .perfstats.txt
@@ -61,8 +69,8 @@ for test in `ls *.tpkg`; do
 			SKIP=1;
 		fi
 	fi
-	if echo $NEED_JOBCONTROL | grep $test >/dev/null; then
-		if test "$JOBCONTROL" = no; then
+	if echo $NEED_NOMINGW | grep $test >/dev/null; then
+		if test "$HAVE_MINGW" = yes; then
 			SKIP=1;
 		fi
 	fi
diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c
index aaa5892c5..b687d1c9e 100644
--- a/testcode/streamtcp.c
+++ b/testcode/streamtcp.c
@@ -68,6 +68,7 @@ open_svr(const char* svr, int udp)
 	socklen_t addrlen;
 	int fd = -1;
 	/* svr can be ip@port */
+	memset(&addr, 0, sizeof(addr));
 	if(!extstrtoaddr(svr, &addr, &addrlen)) {
 		printf("fatal: bad server specs '%s'\n", svr);
 		exit(1);