diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f639c581acd..5075dff97ba 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gfortran.dg/pr40021.f: Moved to ...
+	* gfortran.fortran-torture/execute/pr40021.f: Here.
+
 2009-05-06  Janis Johnson  <janis187@us.ibm.com>
 
 	PR middle-end/39986
@@ -5,6 +10,7 @@
 
 2009-05-06  Michael Matz  <matz@suse.de>
 
+	PR middle-end/40021
 	* gfortran.dg/pr40021.f: New test.
 
 2009-05-06  Le-Chun Wu  <lcwu@google.com>
diff --git a/gcc/testsuite/gfortran.dg/pr40021.f b/gcc/testsuite/gfortran.fortran-torture/execute/pr40021.f
similarity index 85%
rename from gcc/testsuite/gfortran.dg/pr40021.f
rename to gcc/testsuite/gfortran.fortran-torture/execute/pr40021.f
index 6d3f44de4df..ddd269f2a46 100644
--- a/gcc/testsuite/gfortran.dg/pr40021.f
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/pr40021.f
@@ -1,6 +1,4 @@
-! { dg-do run { target i?86-*-* x86_64-*-* } }
-! { dg-require-effective-target ilp32 }
-! { dg-options "-O2 -ftree-vectorize -msse2 -mfpmath=sse -ffast-math" }
+C Derived from lapack
         PROGRAM test
         DOUBLE PRECISION DA
         INTEGER I, N