diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 06f68c5a374..a27c269da3d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-05  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* gfortran.dg/dev_null.f90. Remove and replace with...
+	* gfortran.dg/dev_null.F90: Use preprocessor define to
+	generalize the DEV_NULL name.
+
 2008-05-05  Andrew Pinski  <andrew.pinski@playstation.sony.com>
 
 	* gcc.dg/tree-ssa/forwprop-5.c: New testcase.
diff --git a/gcc/testsuite/gfortran.dg/dev_null.f90 b/gcc/testsuite/gfortran.dg/dev_null.F90
similarity index 65%
rename from gcc/testsuite/gfortran.dg/dev_null.f90
rename to gcc/testsuite/gfortran.dg/dev_null.F90
index edf93dbd1fc..2385e19ee6c 100644
--- a/gcc/testsuite/gfortran.dg/dev_null.f90
+++ b/gcc/testsuite/gfortran.dg/dev_null.F90
@@ -1,8 +1,13 @@
 ! { dg-do run }
 ! pr19478 read from /dev/null
 ! Thomas.Koenig@online.de
+#if defined  _WIN32
+#define DEV_NULL "nul"
+#else
+#define DEV_NULL "/dev/null"
+#endif
       character*20 foo
-      open(10,file="/dev/null")
+      open(10,file=DEV_NULL)
       write(10,'(A)') "Hello"
       rewind(10)
       read(10,'(A)',end=100) foo