diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b27ca79eb1..223964e0d0 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-06  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* gdb.base/solib-disc.exp: Use `standard_output_file'
+	throughout.
+
 2016-10-06  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/jit-simple-dl.c: New file.
diff --git a/gdb/testsuite/gdb.base/solib-disc.exp b/gdb/testsuite/gdb.base/solib-disc.exp
index 66cf9609df..8b61c8315c 100644
--- a/gdb/testsuite/gdb.base/solib-disc.exp
+++ b/gdb/testsuite/gdb.base/solib-disc.exp
@@ -27,11 +27,11 @@ if { [info proc gdb_reconnect] == "" } {
 set testfile solib-disc
 set libfile so-disc-shr
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile [standard_output_file ${testfile}]
 
 set libsrc "${srcdir}/${subdir}/${libfile}.c"
 set libname "${libfile}.so"
-set libobj "${objdir}/${subdir}/${libname}"
+set libobj [standard_output_file ${libname}]
 set execsrc "${srcdir}/${subdir}/${srcfile}"
 set lib_dlopen [shlib_target_file ${libname}]
 set lib_syms [shlib_symbol_file ${libname}]