diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index aed26c8cab..42960998de 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* lib/cell.exp (skip_cell_tests): Clean up test files before
+	returning.
+
 2009-11-12  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* lib/gdb.exp (gdb_test_multiple): Handle "y or [n]", "[y] or n",
diff --git a/gdb/testsuite/lib/cell.exp b/gdb/testsuite/lib/cell.exp
index 18291c7a2b..0d63dde4b3 100644
--- a/gdb/testsuite/lib/cell.exp
+++ b/gdb/testsuite/lib/cell.exp
@@ -106,23 +106,28 @@ proc skip_cell_tests {} {
     verbose "$me:  compiling testfile $src" 2
     set compile_flags {debug nowarnings quiet}
 
+    set skip 0
     if { [gdb_compile_cell_spu $src_spu $exe_spu executable $compile_flags] != "" } {
         verbose "$me:  compiling spu binary failed, returning 1" 2
-        return [set skip_cell_tests_saved 1]
+	set skip 1
     }
-    if { [gdb_cell_embedspu $exe_spu $exe_spu-embed.o $compile_flags]  != "" } {
+    if { ! $skip && [gdb_cell_embedspu $exe_spu $exe_spu-embed.o $compile_flags]  != "" } {
         verbose "$me:  embedding spu binary failed, returning 1" 2
-        return [set skip_cell_tests_saved 1]
+	set skip 1
     }
-    if { [gdb_compile_cell_ppu [list $src $exe_spu-embed.o] $exe executable $compile_flags] != "" } {
+    if { ! $skip && [gdb_compile_cell_ppu [list $src $exe_spu-embed.o] $exe executable $compile_flags] != "" } {
         verbose "$me:  compiling ppu binary failed, returning 1" 2
-        return [set skip_cell_tests_saved 1]
+	set skip 1
     }
     file delete $src
     file delete $src_spu
     file delete $exe_spu
     file delete $exe_spu-embed.o
 
+    if { $skip } {
+        return [set skip_cell_tests_saved 1]
+    }
+
     # Compilation succeeded so now run it via gdb.
 
     gdb_exit