diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 63a43c2c3ad..3a73109176b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2014-03-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/60648
+	* g++.dg/pr60648.C: Move test to...
+	* g++.dg/torture/pr60648.C: ... here.  Run on all targets, remove
+	dg-options, add for fpic targets dg-additional-options -fPIC.
+
 2014-03-28  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/opt33.adb: New testcase.
diff --git a/gcc/testsuite/g++.dg/pr60648.C b/gcc/testsuite/g++.dg/torture/pr60648.C
similarity index 86%
rename from gcc/testsuite/g++.dg/pr60648.C
rename to gcc/testsuite/g++.dg/torture/pr60648.C
index 80c05616c2f..48cf0afb52b 100644
--- a/gcc/testsuite/g++.dg/pr60648.C
+++ b/gcc/testsuite/g++.dg/torture/pr60648.C
@@ -1,6 +1,6 @@
-/* { dg-do compile } */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O3 -fPIC -m32" }  */
+// PR target/60648
+// { dg-do compile }
+// { dg-additional-options "-fPIC" { target fpic } }
 
 enum component
 {
@@ -68,6 +68,3 @@ void fn3 ()
   b[1] = fn2 (e);
   d = fn1 (c);
 }
-
-
-