diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 17b4ceb5ab..74f137837c 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1461,6 +1461,7 @@ test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
 get_rsasha1_key_ids_from_sigs() {
+	tr -d '\r' < signer/example.db.signed | \
 	awk '
 		NF < 8 { next }
 		$(NF-5) != "RRSIG" { next }
@@ -1470,7 +1471,8 @@ get_rsasha1_key_ids_from_sigs() {
 			getline;
 			print $3;
 		}
-	' signer/example.db.signed | sort -u
+	' | \
+	sort -u
 }
 
 echo_i "checking that we can sign a zone with out-of-zone records ($n)"
diff --git a/bin/tests/system/ifconfig.bat b/bin/tests/system/ifconfig.bat
index d4ba3f2dc7..3d31c8dd60 100644
--- a/bin/tests/system/ifconfig.bat
+++ b/bin/tests/system/ifconfig.bat
@@ -10,8 +10,8 @@ rem ifconfig.bat
 rem Set up interface aliases for bind9 system tests.
 rem
 rem IPv4: 10.53.0.{1..10}			RFC 1918
-rem       10.53.1.{0..2}
-rem       10.53.2.{0..2}
+rem       10.53.1.{1..2}
+rem       10.53.2.{1..2}
 rem IPv6: fd92:7065:b8e:ffff::{1..10}		ULA
 rem       fd92:7065:b8e:99ff::{1..2}
 rem       fd92:7065:b8e:ff::{1..2}
@@ -31,7 +31,7 @@ rem exit line
 
 echo on
 
-FOR %%I IN (1,2,3,4,5,6,7,8) DO (
+FOR %%I IN (1,2,3,4,5,6,7,8,9,10) DO (
 	netsh interface ipv4 add address name=Loopback 10.53.0.%%I 255.255.255.0
 	netsh interface ipv6 add address interface=Loopback fd92:7065:b8e:ffff::%%I/64
 )
diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index 051e2d2566..aab6eb534b 100755
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -13,8 +13,8 @@
 # Set up interface aliases for bind9 system tests.
 #
 # IPv4: 10.53.0.{1..10}				RFC 1918
-#       10.53.1.{0..2}
-#       10.53.2.{0..2}
+#       10.53.1.{1..2}
+#       10.53.2.{1..2}
 # IPv6: fd92:7065:b8e:ffff::{1..10}		ULA
 #       fd92:7065:b8e:99ff::{1..2}
 #       fd92:7065:b8e:ff::{1..2}
diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index 1045ee374f..1a78ade59f 100644
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -131,6 +131,8 @@ exit($errors);
 sub server_lock_file {
 	my ( $server ) = @_;
 
+	return if (defined($ENV{'CYGWIN'}));
+
 	return $testdir . "/" . $server . "/named.lock" if ($server =~ /^ns/);
 	return if ($server =~ /^ans/);