diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index 4332ac83cc..57cb752343 100644
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -134,7 +134,7 @@ exit($errors);
 sub server_lock_file {
 	my ( $server ) = @_;
 
-	return if (defined($ENV{'CYGWIN'}));
+	return if (defined($ENV{'CYGWIN'}) && $ENV{'CYGWIN'});
 
 	return $testdir . "/" . $server . "/named.lock" if ($server =~ /^ns/);
 	return if ($server =~ /^ans/);
@@ -255,7 +255,7 @@ sub pid_file_exists {
 	if (send_signal(0, $pid) == 0) {
 		# XXX: on windows this is likely to result in a
 		# false positive, so don't bother reporting the error.
-		if (!defined($ENV{'CYGWIN'})) {
+		if (!defined($ENV{'CYGWIN'}) || !$ENV{'CYGWIN'}) {
 			print "I:$test:$server crashed on shutdown\n";
 			$errors = 1;
 		}