diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c7b4272f48..40aa47d383 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* lib/future.exp: Set $use_gdb_compile even if only find_go_linker is
+	missing.
+
 2012-06-11  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.base/longjmp.c (hidden_longjmp): Move expected catch
diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp
index 40456c01a7..bf47988d0b 100644
--- a/gdb/testsuite/lib/future.exp
+++ b/gdb/testsuite/lib/future.exp
@@ -514,7 +514,7 @@ if {[info procs find_gfortran] == ""} {
 if {[info procs find_go_linker] == ""} {
     rename gdb_find_go find_go
     rename gdb_find_go_linker find_go_linker
-    # No need to set use_gdb_compile.
+    set use_gdb_compile 1
 }
 
 if {$use_gdb_compile} {