diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3a28954294c..3a0dfed8bfd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2014-11-12  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	* gcc.target/arm/eabi1.c: Replace arm*-*-*eabi* and arm*-*-symbianelf*
+	with arm_eabi.
+	* g++.dg/abi/arm_rtti1.C: Likewise.
+	* g++.dg/abi/key1.C: Likewise.
+	* g++.dg/ext/visibility/arm1.C: Likewise.
+	* g++.dg/ext/visibility/arm2.C: Likewise.
+	* g++.dg/ext/visibility/arm3.C: Likewise.
+
 2014-11-11  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* g++.dg/ipa/devirt-42.C: Fix dump scanning for "return 2".
diff --git a/gcc/testsuite/g++.dg/abi/arm_rtti1.C b/gcc/testsuite/g++.dg/abi/arm_rtti1.C
index a481bdd1f13..74f00033d9a 100644
--- a/gcc/testsuite/g++.dg/abi/arm_rtti1.C
+++ b/gcc/testsuite/g++.dg/abi/arm_rtti1.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target arm*-*-eabi* arm*-*-symbianelf* } }
+// { dg-do compile { target arm_eabi } }
 // { dg-options "-O2" } 
 // Check that, even when optimizing, we emit an out-of-line call to
 // the type-info comparison function.
diff --git a/gcc/testsuite/g++.dg/abi/key1.C b/gcc/testsuite/g++.dg/abi/key1.C
index 6c038092641..1c00b03b5ad 100644
--- a/gcc/testsuite/g++.dg/abi/key1.C
+++ b/gcc/testsuite/g++.dg/abi/key1.C
@@ -1,5 +1,5 @@
 // On ARM EABI platforms, key methods may never be inline.
-// { dg-do compile { target arm*-*-eabi* arm*-*-symbianelf* } }
+// { dg-do compile { target arm_eabi } }
 // { dg-final { scan-assembler-not _ZTV1S } }
 // { dg-final { scan-assembler-not _ZTV1T } }
 // { dg-final { scan-assembler _ZTV1U } }
diff --git a/gcc/testsuite/g++.dg/ext/visibility/arm1.C b/gcc/testsuite/g++.dg/ext/visibility/arm1.C
index 2c2e3d0664a..d718de5cd2e 100644
--- a/gcc/testsuite/g++.dg/ext/visibility/arm1.C
+++ b/gcc/testsuite/g++.dg/ext/visibility/arm1.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target arm*-*-eabi* arm*-*-symbianelf* } }
+// { dg-do compile { target arm_eabi } }
 // { dg-require-dll "" }
 // { dg-options "-fvisibility=hidden" }
 // Most class data should be exported.
diff --git a/gcc/testsuite/g++.dg/ext/visibility/arm2.C b/gcc/testsuite/g++.dg/ext/visibility/arm2.C
index 7eed18d7f85..a0a36010dcc 100644
--- a/gcc/testsuite/g++.dg/ext/visibility/arm2.C
+++ b/gcc/testsuite/g++.dg/ext/visibility/arm2.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target arm*-*-*eabi* arm*-*-symbianelf* } }
+// { dg-do compile { target arm_eabi } }
 // Class data should be exported.
 // { dg-final { scan-not-hidden "_ZTV1S" } }
 // { dg-final { scan-not-hidden "_ZTI1S" } }
diff --git a/gcc/testsuite/g++.dg/ext/visibility/arm3.C b/gcc/testsuite/g++.dg/ext/visibility/arm3.C
index 9be7082ce1d..52a935fc0ce 100644
--- a/gcc/testsuite/g++.dg/ext/visibility/arm3.C
+++ b/gcc/testsuite/g++.dg/ext/visibility/arm3.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target arm*-*-*eabi* } }
+// { dg-do compile { target arm_eabi } }
 // { dg-require-dll "" }
 // { dg-options "-fvisibility=hidden" }
 
diff --git a/gcc/testsuite/gcc.target/arm/eabi1.c b/gcc/testsuite/gcc.target/arm/eabi1.c
index c90f5ff0856..0175d79b423 100644
--- a/gcc/testsuite/gcc.target/arm/eabi1.c
+++ b/gcc/testsuite/gcc.target/arm/eabi1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target arm*-*-symbianelf* arm*-*-eabi* } } */
+/* { dg-do run { target arm_eabi } } */
 /* { dg-options "" } */
 
 /* This file tests most of the non-C++ run-time helper functions