diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 0c699c12d8..46ba56812a 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -4,6 +4,8 @@
 	* binutils-all/copy-3.d (not-target): Likewise.
 	* binutils-all/objcopy.exp (objcopy_test): Remove extraneous
 	setup_xfail.
+	* windres/windres.exp: Return unsupported rather than fail if
+	windows.h not found.
 
 2007-07-05  Nick Clifton  <nickc@redhat.com>
 
diff --git a/binutils/testsuite/binutils-all/windres/windres.exp b/binutils/testsuite/binutils-all/windres/windres.exp
index eb219dd456..9c2f4773b9 100644
--- a/binutils/testsuite/binutils-all/windres/windres.exp
+++ b/binutils/testsuite/binutils-all/windres/windres.exp
@@ -88,7 +88,11 @@ foreach res $res_list {
     if ![string match "" $err] then {
 	send_log "$err\n"
 	verbose "$err" 1
-	fail "windres/$broot (parse)"
+	if [string match "*windows.h: No such file*" $err] then {
+	    unsupported "windres/$broot (parse)"
+	} else {
+	    fail "windres/$broot (parse)"
+	}
 	continue
     }
     pass "windres/$broot (parse)"