diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 70853cd119b..e1e31c0b909 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-31  Richard Guenther  <rguenther@suse.de>
+
+	* g++.dg/other/str_empty.C: Move...
+	* g++.dg/other/pr30567.C: Move...
+	* g++.dg/tree-ssa/pr27218.C: Move...
+	* g++.dg/torture: ...here and remove dg-options.
+
 2007-05-31  Paolo Carlini  <pcarlini@suse.de>
 
 	PR c++/32158
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr27218.C b/gcc/testsuite/g++.dg/torture/pr27218.C
similarity index 87%
rename from gcc/testsuite/g++.dg/tree-ssa/pr27218.C
rename to gcc/testsuite/g++.dg/torture/pr27218.C
index 644d2fca9ac..b1e18dd33a2 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/pr27218.C
+++ b/gcc/testsuite/g++.dg/torture/pr27218.C
@@ -1,5 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-O2" } */
 
 struct Vector
 {
diff --git a/gcc/testsuite/g++.dg/other/pr30567.C b/gcc/testsuite/g++.dg/torture/pr30567.C
similarity index 88%
rename from gcc/testsuite/g++.dg/other/pr30567.C
rename to gcc/testsuite/g++.dg/torture/pr30567.C
index 626d27bb386..389daf35784 100644
--- a/gcc/testsuite/g++.dg/other/pr30567.C
+++ b/gcc/testsuite/g++.dg/torture/pr30567.C
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O -finline-functions -fstrict-aliasing" } */
 
 template <typename T>
 struct const_ref
diff --git a/gcc/testsuite/g++.dg/other/str_empty.C b/gcc/testsuite/g++.dg/torture/str_empty.C
similarity index 91%
rename from gcc/testsuite/g++.dg/other/str_empty.C
rename to gcc/testsuite/g++.dg/torture/str_empty.C
index fc2cb1d75f2..0a6aabf7c33 100644
--- a/gcc/testsuite/g++.dg/other/str_empty.C
+++ b/gcc/testsuite/g++.dg/torture/str_empty.C
@@ -2,7 +2,6 @@
 // Segfault in integer_zerop
 // Origin: Andrew Pinski  <andrew_pinski@playstation.sony.com>
 // { dg-do compile }
-// { dg-options "-O2" }
 
 struct polynomial {
   ~polynomial ();