diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 73df28faf1..8e7af0bb47 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-12  Tom de Vries  <tdevries@suse.de>
+
+	* lib/jit-elf-helpers.exp: Don't use undefined variables in untested
+	messages.
+
 2020-05-12  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.multi/multi-term-settings.exp: Use with_test_prefix.
diff --git a/gdb/testsuite/lib/jit-elf-helpers.exp b/gdb/testsuite/lib/jit-elf-helpers.exp
index ab647abe50..62672f4ab3 100644
--- a/gdb/testsuite/lib/jit-elf-helpers.exp
+++ b/gdb/testsuite/lib/jit-elf-helpers.exp
@@ -37,9 +37,10 @@ proc compile_jit_main {main_srcfile main_binfile options} {
 	debug]
 
     if { [gdb_compile ${main_srcfile} ${main_binfile} \
-	  executable $options] != "" } {
-	      untested "failed to compile ${main_basename}.c"
-	      return -1
+	      executable $options] != "" } {
+	set f [file tail $main_binfile]
+	untested "failed to compile $f"
+	return -1
     }
 
     return 0
@@ -61,8 +62,9 @@ proc compile_jit_elf_main_as_so {main_solib_srcfile main_solib_binfile options}
 	debug]
 
     if { [gdb_compile_shlib ${main_solib_srcfile} ${main_solib_binfile} \
-	    $options] != "" } {
-	untested "failed to compile ${main_solib_basename}.c as a shared library"
+	      $options] != "" } {
+	set f [file tail $main_solib_binfile]
+	untested "failed to compile shared library $f"
 	return -1
     }
 
@@ -94,8 +96,10 @@ proc compile_and_download_n_jit_so {jit_solib_basename jit_solib_srcfile count}
 	    additional_flags=-DFUNCTION_NAME=[format "jit_function_%04d" $i] \
 	    additional_flags=-Xlinker \
 	    additional_flags=-Ttext-segment=$addr]
-	if { [gdb_compile_shlib ${jit_solib_srcfile} ${binfile} $options] != "" } {
-	    untested "failed to compile ${jit_solib_basename}.c as a shared library"
+	if { [gdb_compile_shlib ${jit_solib_srcfile} ${binfile} \
+		  $options] != "" } {
+	    set f [file tail $binfile]
+	    untested "failed to compile shared library $binfile"
 	    return -1
 	}
 
@@ -104,4 +108,4 @@ proc compile_and_download_n_jit_so {jit_solib_basename jit_solib_srcfile count}
     }
 
     return $binfiles_target
-}
\ No newline at end of file
+}