diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 16c6437605..d0028ef193 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/store.exp: Don't use gdb_suppress_entire_file.
+
 2006-06-22  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.base/gdb1555.exp: Use gdb_compile_shlib.  Skip if not
diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp
index 7b92eca3bf..82bcb0dd03 100644
--- a/gdb/testsuite/gdb.base/store.exp
+++ b/gdb/testsuite/gdb.base/store.exp
@@ -30,7 +30,8 @@ set testfile "store"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested store.exp
+    return -1
 }
 
 if [get_compiler_info ${binfile}] {