diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2ea3d7700e3f..7d7dae4dcf9d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-02  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* gcc.dg/spec-options.c: Run the test on all targets.
+	* gcc.dg/foo.specs: Use cpp_unique_options.
+
 2016-05-02  Marc Glisse  <marc.glisse@inria.fr>
 
 	* gcc.dg/tree-ssa/unord.c: New testcase.
diff --git a/gcc/testsuite/gcc.dg/foo.specs b/gcc/testsuite/gcc.dg/foo.specs
index 8819249fa340..45fc84306cde 100644
--- a/gcc/testsuite/gcc.dg/foo.specs
+++ b/gcc/testsuite/gcc.dg/foo.specs
@@ -1,2 +1,2 @@
-*cppruntime:
+*cpp_unique_options:
 + %{tfoo: -DFOO}
diff --git a/gcc/testsuite/gcc.dg/spec-options.c b/gcc/testsuite/gcc.dg/spec-options.c
index e3ab23ac1101..01d0a0929e0f 100644
--- a/gcc/testsuite/gcc.dg/spec-options.c
+++ b/gcc/testsuite/gcc.dg/spec-options.c
@@ -1,8 +1,7 @@
 /* Check that -mfoo is accepted if defined in a user spec
    and that it is not passed on the command line.  */
 /* Must be processed in EXTRA_SPECS to run.  */
-/* { dg-do compile } */
-/* { dg-do run { target sh*-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-B${srcdir}/gcc.dg --specs=foo.specs -tfoo" } */
 
 extern void abort(void);