diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 24d1b43f11bedc4da0cad0415e63d16f80e1d1d3..58804ecab2674b23f83ee5663420b68773b53161 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -615,11 +615,14 @@ proc v3_target_compile { source dest type options } {
 	}
     }
 
-    # Small adjustment for MinGW hosts.
-    if { $dest == "/dev/null" && [ishost "*-*-mingw*"] } {
+    # Small adjustment for Windows hosts.
+    if { $dest == "/dev/null"
+	  && [info exists ::env(OS)] && [string match "Windows*" $::env(OS)] } {
 	if { $type == "executable" } {
 	    set dest "x.exe"
 	} else {
+	    # Windows uses special file named "nul" as a substitute for
+	    # /dev/null
 	    set dest "nul"
 	}
     }