diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index aa1544f953..e539d88b6a 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-02  Pedro Alves  <pedro@codesourcery.com>
+
+	* gdb.threads/gcore-thread.exp: Set the global core_supported to
+	0, before testing gcore.
+
 2011-09-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* dw2-ifort-parameter-debug.S: Update copyright year.
diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
index fc5a3ccb0a..db158d82b5 100644
--- a/gdb/testsuite/gdb.threads/gcore-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-thread.exp
@@ -100,6 +100,7 @@ gdb_test "continue" "Continuing.*Breakpoint.* thread2 .*" "thread 2 is running"
 
 set escapedfilename [string_to_regexp $corefile]
 # Drop corefile
+set core_supported 0
 gdb_test_multiple "gcore $corefile" "save a corefile" \
 {
   -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
@@ -109,12 +110,9 @@ gdb_test_multiple "gcore $corefile" "save a corefile" \
   }
   -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
     unsupported "save a corefile"
-    global core_supported
-    set core_supported 0
   }
 }
 
-global core_supported
 if {!$core_supported} {
   return -1
 }