diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f2c294754cf76d12afd039b55b9440db063da798..528ba66c649d47d59dd3e8b79b4661df5d608b23 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2006-03-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* gfortran.dg/direct_io_1.f90, gfortran.dg/iostat_2.f90,
+	gfortran.dg/open_new.f90, gfortran.dg/open_readonly_1.f90,
+	gfortran.dg/pr16935.f90, gfortran.dg/pr20954.f,
+	gfortran.dg/read_many_1.f, gfortran.dg/unf_io_convert_2.f90,
+	gfortran.fortran-torture/execute/direct_io.f90,
+	gfortran.fortran-torture/execute/inquire_2.f90,
+	gfortran.fortran-torture/execute/inquire_4.f90,
+	gfortran.fortran-torture/execute/list_read_1.f90,
+	gfortran.fortran-torture/execute/open_replace.f90,
+	gfortran.fortran-torture/execute/slash_edit.f90,
+	gfortran.fortran-torture/execute/unopened_unit_1.f90: Delete
+	temporary files from testcases.
+
 2006-03-17  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libgfortran/26509
diff --git a/gcc/testsuite/gfortran.dg/direct_io_1.f90 b/gcc/testsuite/gfortran.dg/direct_io_1.f90
index 92eff2942b426721ee76d346405855061d900952..96ae49035063a24c969781c2f4584532c4063e6b 100644
--- a/gcc/testsuite/gfortran.dg/direct_io_1.f90
+++ b/gcc/testsuite/gfortran.dg/direct_io_1.f90
@@ -28,5 +28,5 @@ program direct_io_1
   n = 1
   write(12, rec=n) mt, nt
   write(12, rec=n+1) (p(m), m=1, nt)
-  close(12)
+  close(12, status='delete')
 end program
diff --git a/gcc/testsuite/gfortran.dg/iostat_2.f90 b/gcc/testsuite/gfortran.dg/iostat_2.f90
index 2b4cb5d7e832e7c436f982bc905765e69a838efe..124567c1e3221b4a18f7fd18db9f6c6818c3626c 100644
--- a/gcc/testsuite/gfortran.dg/iostat_2.f90
+++ b/gcc/testsuite/gfortran.dg/iostat_2.f90
@@ -4,4 +4,5 @@
   close(10, status="whatever", iostat=i)
   if (i == 0) call abort()
   write(17,*) 'foo'
+  close(17, status="delete")
   end
diff --git a/gcc/testsuite/gfortran.dg/open_new.f90 b/gcc/testsuite/gfortran.dg/open_new.f90
index 3b8e95ae9440c1cacddbf7a0623a62d62d8e95a9..96edd93c3473a0b045a180cebc2e3516cd95618d 100644
--- a/gcc/testsuite/gfortran.dg/open_new.f90
+++ b/gcc/testsuite/gfortran.dg/open_new.f90
@@ -7,5 +7,5 @@ program main
   close(nout)
   open(nout, file="foo.dat", status="new",err=100)
   call abort                 ! This should never happen
-100 continue
+100 call unlink ("foo.dat")
 end program main
diff --git a/gcc/testsuite/gfortran.dg/open_readonly_1.f90 b/gcc/testsuite/gfortran.dg/open_readonly_1.f90
index 622a07d2aeeafeb039a35cad330f11590a0626d1..3adbbd324988e5983656950a30f02c15f255db70 100644
--- a/gcc/testsuite/gfortran.dg/open_readonly_1.f90
+++ b/gcc/testsuite/gfortran.dg/open_readonly_1.f90
@@ -9,6 +9,6 @@ program prog
   open (unit=10, file='PR19451.dat', action="read")
   write (10,*,err=20) "Hello World"
   call abort()
-  20 continue
+  20 close (10, status='delete')
 end program
 
diff --git a/gcc/testsuite/gfortran.dg/pr16935.f90 b/gcc/testsuite/gfortran.dg/pr16935.f90
index 63f540057fdbe60bd5bc71b0c8ed9279ca140ea7..b7dd236fddf553d1e7a9c44c204074e7540437ce 100644
--- a/gcc/testsuite/gfortran.dg/pr16935.f90
+++ b/gcc/testsuite/gfortran.dg/pr16935.f90
@@ -4,4 +4,5 @@
        program bug2
        implicit none
        open( 1 , file = "str_500.txt", position = "REWIND" )
+       close( 1 , status = "DELETE" )
        end
diff --git a/gcc/testsuite/gfortran.dg/pr20954.f b/gcc/testsuite/gfortran.dg/pr20954.f
index b19b782f66797a901d37debfaab57523a9a6669c..be820c1e937e1fdec5bf2f61393bd66497feee5b 100644
--- a/gcc/testsuite/gfortran.dg/pr20954.f
+++ b/gcc/testsuite/gfortran.dg/pr20954.f
@@ -8,4 +8,5 @@
       filename = 'input'
       open (2,file=filename)
       write (line, '(5a16)') (string(i),i=1,5)
+      close (2, status='delete')
       end
diff --git a/gcc/testsuite/gfortran.dg/read_many_1.f b/gcc/testsuite/gfortran.dg/read_many_1.f
index ef81fa81f44e9572d2bbd193862ff6702f03d3c8..4fac689ac48b1296e34bafdfcbb3c0fc9ca30426 100644
--- a/gcc/testsuite/gfortran.dg/read_many_1.f
+++ b/gcc/testsuite/gfortran.dg/read_many_1.f
@@ -20,4 +20,5 @@
       if (b(2).ne.5) call abort()
       if (a(3000).ne.1234) call abort()
       if (b(2048).ne.5678) call abort()
+      close(2, status='delete')
       end
diff --git a/gcc/testsuite/gfortran.dg/unf_io_convert_2.f90 b/gcc/testsuite/gfortran.dg/unf_io_convert_2.f90
index 42bad3ee30ff5ea17b136644f6dbff866f1c3922..f29f6ee249e89f39e2cac6cab6c60d7c533ba881 100644
--- a/gcc/testsuite/gfortran.dg/unf_io_convert_2.f90
+++ b/gcc/testsuite/gfortran.dg/unf_io_convert_2.f90
@@ -35,5 +35,6 @@ program main
   backspace 10
   read (10) j
   if (j /= Z'5566770011223344') call abort
+  close (10, status="delete")
 
 end program main
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/direct_io.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/direct_io.f90
index b8078f03d5ebfd2c595d0b44e1cf1721f6d56992..deba9a6bfa50437c719cef3cd674bb8c3f013ad6 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/direct_io.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/direct_io.f90
@@ -13,6 +13,7 @@
             CALL ABORT
           ENDIF
        ENDDO
+       CLOSE(10,STATUS='DELETE')
        STOP
  10    CONTINUE
 !      PRINT*,' ERR= RETURN FROM READ OR WRITE'
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/inquire_2.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/inquire_2.f90
index bc7ea74c39afaaec7c543396faa274e83408be31..48105170248de1857930b4e3f95c9014b2afc221 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/inquire_2.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/inquire_2.f90
@@ -3,4 +3,5 @@
       OPEN(FILE='CSEQ', UNIT=23)
       INQUIRE(FILE='CSEQ',NUMBER=UNIT)
       IF (UNIT.NE.23) CALL ABORT
+      CLOSE(UNIT, STATUS='DELETE')
       END
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/inquire_4.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/inquire_4.f90
index 5b94ad232bc803919a8bfe68e037bc6adef5695c..2fa69cc3f9f8cd93649f0d734be2c3a83c036e45 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/inquire_4.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/inquire_4.f90
@@ -16,5 +16,6 @@
 !          PRINT*,'NEXTREC RETURNED ',J,' EXPECTED 4'
            CALL ABORT
        ENDIF
+       CLOSE(UNIT=10,STATUS='DELETE')
        END
 
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/list_read_1.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/list_read_1.f90
index 040ae72d8e06480bf6378e9f5cbe9074a07ab70c..0a20b4bde839523cafffb02677526eae806ee550 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/list_read_1.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/list_read_1.f90
@@ -50,4 +50,5 @@
               if (x(i,k).ne.y(i,k)) call abort
          end do
       end do
+      close(nin, status='delete')
       end program d
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/open_replace.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/open_replace.f90
index 1d8ac4ba7870dff386d52c8f661270327bf44cad..11d0d09461ab0fb7745f8cc8856a14458ab576a6 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/open_replace.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/open_replace.f90
@@ -2,4 +2,5 @@
 ! open with 'REPLACE' creates the file if it does not exist.
       PROGRAM iobug
       OPEN(UNIT=10,FILE='gfcoutput.txt',status='REPLACE')
+      CLOSE(10,status='DELETE')
       END PROGRAM iobug
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/slash_edit.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/slash_edit.f90
index c73d5432a31e58b564660cea3c44ffe90a95bd3c..29f44a7dd4ebf342e14e1620ed06de71bb9c88f4 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/slash_edit.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/slash_edit.f90
@@ -8,7 +8,7 @@
        OPEN(7)
  200   FORMAT(I4,///I4)
        READ(7,200)I,J
-       CLOSE(7) 
+       CLOSE(7, STATUS='DELETE') 
        IF (I.NE.1) CALL ABORT
        IF (J.NE.4) CALL ABORT
        END
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/unopened_unit_1.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/unopened_unit_1.f90
index d87406ab4db6aa23bda1ceb3b3e949a4ca3aae08..66895b02af16499e08cb9cc095bf3225fb160e3d 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/unopened_unit_1.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/unopened_unit_1.f90
@@ -9,5 +9,6 @@ program unopened_unit_1
     Read(99,*)J
     If (J.ne.I) Call abort
   End Do
+  Close(99, Status='Delete')
 End program