diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 22a69a24fd31cfa0a7e33c3edaa0a009b1ea84e8..a821acb39a8190a36c845efba86e2b85f93e0474 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-09  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
+	Paul Brook  <paul@codesourcery.com>
+
+	* gfortran.dg/dg.exp: Use revised wilcard for suffixes, also allow 
+	'.f95' and '.F95'.
+
 2004-07-09  Diego Novillo  <dnovillo@redhat.com>
 
 	* gcc.dg/tree-ssa/20031015-1.c: Adjust expected dump file name.
diff --git a/gcc/testsuite/gfortran.dg/dg.exp b/gcc/testsuite/gfortran.dg/dg.exp
index 58f3bf673d298fdd5973ccb2d268137c828de3f8..21c3d2278a3bd0c2e14294a52869daef2cbd7996 100644
--- a/gcc/testsuite/gfortran.dg/dg.exp
+++ b/gcc/testsuite/gfortran.dg/dg.exp
@@ -29,23 +29,12 @@ if ![info exists DEFAULT_FFLAGS] then {
 dg-init
 
 # Main loop.
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.f ] ]\
-	$DEFAULT_FFLAGS
+gfortran-dg-runtest [lsort \
+       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ] ] $DEFAULT_FFLAGS
 
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.F ] ]\
-	$DEFAULT_FFLAGS
+gfortran-dg-runtest [lsort \
+       [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] $DEFAULT_FFLAGS
 
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.f90 ] ]\
-	$DEFAULT_FFLAGS
-
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.F90 ] ]\
-	$DEFAULT_FFLAGS
-
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/g77/*.f ] ] \
-	$DEFAULT_FFLAGS
-
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/g77/*.F ] ] \
-	$DEFAULT_FFLAGS
 
 # All done.
 dg-finish