diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 349aac9ef9..c79e1e8f20 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-08-07  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* gdb.fortran/nested-funcs.exp: Replace "set index = 42" with
+	"set variable index = 42".
+
 2018-08-07  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* boards/index-cache-gdb.exp: New file.
diff --git a/gdb/testsuite/gdb.fortran/nested-funcs.exp b/gdb/testsuite/gdb.fortran/nested-funcs.exp
index 20569307b9..2481d256af 100755
--- a/gdb/testsuite/gdb.fortran/nested-funcs.exp
+++ b/gdb/testsuite/gdb.fortran/nested-funcs.exp
@@ -35,7 +35,7 @@ if ![runto MAIN__] then {
 gdb_breakpoint [gdb_get_line_number "! BP_outer"]
 gdb_continue_to_breakpoint "! BP_outer" ".*! BP_outer"
 gdb_test "print index" "= 13" "print index at BP_outer"
-gdb_test "set index = 42"
+gdb_test_no_output "set variable index = 42"
 gdb_test "print index" "= 42" "print index at BP_outer, manipulated"
 gdb_test "print local_int" "= 19" "print local_int in outer function"