diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9e3485d73b2..b15890b0cad 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-01  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	* gfortran.dg/enum_9.f90: Use arm_eabi instead of arm*-*-linux*.
+	* gfortran.dg/enum_10.f90: Likewise. Reorder dg-additional-sources.
+
 2015-02-01  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/64817
diff --git a/gcc/testsuite/gfortran.dg/enum_10.f90 b/gcc/testsuite/gfortran.dg/enum_10.f90
index 80e7fca8013..22d5af0f05c 100644
--- a/gcc/testsuite/gfortran.dg/enum_10.f90
+++ b/gcc/testsuite/gfortran.dg/enum_10.f90
@@ -1,7 +1,7 @@
 ! { dg-do run }
-! { dg-additional-sources enum_10.c }
 ! { dg-options "-fshort-enums -w" }
-! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux* } }
+! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm_eabi } }
+! { dg-additional-sources enum_10.c }
 ! Make sure short enums are indeed interoperable with the
 ! corresponding C type.
 
diff --git a/gcc/testsuite/gfortran.dg/enum_9.f90 b/gcc/testsuite/gfortran.dg/enum_9.f90
index d3187c75b9b..a9b95b439e2 100644
--- a/gcc/testsuite/gfortran.dg/enum_9.f90
+++ b/gcc/testsuite/gfortran.dg/enum_9.f90
@@ -1,6 +1,6 @@
 ! { dg-do run }
 ! { dg-options "-fshort-enums" }
-! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux* } }
+! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm_eabi } }
 ! Program to test enumerations when option -fshort-enums is given
 
 program main