diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ca56282f46387158445c2768908ab6f604fa4a3d..0d468f09c284d75bd4d9c577f260f09939024c7d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -25,7 +25,7 @@
 
 2008-04-30  Kai Tietz  <kai.tietz@onevision.com>
 
-	* gfortran.dg/chmod_1.f90: Disable for x86_64-*-mingw*.
+	* gfortran.dg/chmod_1.f90: Disable for *-*-mingw*.
 	* gfortran.dg/chmod_2.f90: Likewise.
 	* gfortran.dg/chmod_3.f90: Likewise.
 	* gfortran.dg/open_errors.f90: Likewise.
diff --git a/gcc/testsuite/gfortran.dg/chmod_1.f90 b/gcc/testsuite/gfortran.dg/chmod_1.f90
index 551ceb43391c4e6663444dc6c717c1cd3e1df245..e83beccf84bc5ce1bc3cd87af6dcd5a7f2c95eee 100644
--- a/gcc/testsuite/gfortran.dg/chmod_1.f90
+++ b/gcc/testsuite/gfortran.dg/chmod_1.f90
@@ -1,4 +1,4 @@
-! { dg-do run { target { ! x86_64-*-mingw* } } }
+! { dg-do run { target { ! *-*-mingw* } } }
 ! { dg-options "-std=gnu" }
   implicit none
   character(len=*), parameter :: n = "foobar_file"
diff --git a/gcc/testsuite/gfortran.dg/chmod_2.f90 b/gcc/testsuite/gfortran.dg/chmod_2.f90
index a224eb57199620aa655156dc28783db646620211..f319cd1868e205ef7723139eed7eda4eba0e59aa 100644
--- a/gcc/testsuite/gfortran.dg/chmod_2.f90
+++ b/gcc/testsuite/gfortran.dg/chmod_2.f90
@@ -1,4 +1,4 @@
-! { dg-do run { target { ! x86_64-*-mingw* } } }
+! { dg-do run { target { ! *-*-mingw* } } }
 ! { dg-options "-std=gnu" }
   implicit none
   character(len=*), parameter :: n = "foobar_file"
diff --git a/gcc/testsuite/gfortran.dg/chmod_3.f90 b/gcc/testsuite/gfortran.dg/chmod_3.f90
index c6b1b846cfb051abec0e621194736430edc17923..63a4bbb564e42ac68b0d306aeec3b1ddd8d3d18b 100644
--- a/gcc/testsuite/gfortran.dg/chmod_3.f90
+++ b/gcc/testsuite/gfortran.dg/chmod_3.f90
@@ -1,4 +1,4 @@
-! { dg-do run { target { ! x86_64-*-mingw* } } }
+! { dg-do run { target { ! *-*-mingw* } } }
 ! { dg-options "-std=gnu -fdefault-integer-8" }
   implicit none
   character(len=*), parameter :: n = "foobar_file"
diff --git a/gcc/testsuite/gfortran.dg/open_errors.f90 b/gcc/testsuite/gfortran.dg/open_errors.f90
index 51c750ea0b6f084020fff4c788a47f56f25c741b..0def37a63569f150b1ab17c2d72ce51111a22b94 100644
--- a/gcc/testsuite/gfortran.dg/open_errors.f90
+++ b/gcc/testsuite/gfortran.dg/open_errors.f90
@@ -1,4 +1,4 @@
-! { dg-do run { target { ! x86_64-*-mingw* } } }
+! { dg-do run { target { ! *-*-mingw* } } }
 ! PR30005 Enhanced error messages for OPEN
 ! Submitted by Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 character(60) :: msg