diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7f855c12e96..2986250df24 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-23  Jerry DeLisle  <jvdelisle@verizon.net>
+
+        * gfortran.fortran-torture/execute/nan_inf_fmt.f90: Revise test to
+        include case of field width of zero. 
+
 2005-07-23  Jerry DeLisle  <jvdelisle@verizon.net>
 
         PR libgfortran/21875
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.f90
index 86e6916a0c4..22e17d12eb2 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.f90
@@ -12,6 +12,14 @@
        neg_inf = -1.0/zero
        nan = zero/zero
 
+! check a field width = 0
+       fmt = '(F0.0)'
+       write(l,fmt=fmt)pos_inf
+       if (l.ne.'+Inf') call abort
+       write(l,fmt=fmt)neg_inf
+       if (l.ne.'-Inf') call abort
+       write(l,fmt=fmt)nan
+       if (l.ne.' NaN') call abort
 
 ! check a field width < 3
        fmt = '(F2.0)'
@@ -27,7 +35,7 @@
        write(l,fmt=fmt)pos_inf
        if (l.ne.'Inf') call abort
        write(l,fmt=fmt)neg_inf
-       if (l.ne.'Inf') call abort
+       if (l.ne.'***') call abort
        write(l,fmt=fmt)nan
        if (l.ne.'NaN') call abort