diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2726d46b05..745d2d1deb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-14  Pedro Alves  <palves@redhat.com>
+
+	* gdb.base/nodebug.exp (nodebug_runto): New procedure.
+	(top level): Use it instead of runto.
+
 2017-09-11  Tom Tromey  <tom@tromey.com>
 
 	* gdb.base/ena-dis-br.exp (test_ena_dis_br): Update test.
diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp
index 2099456dde..3a2a821be6 100644
--- a/gdb/testsuite/gdb.base/nodebug.exp
+++ b/gdb/testsuite/gdb.base/nodebug.exp
@@ -39,6 +39,21 @@ if  { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "
 
 clean_restart $binfile
 
+# Run to FUNC and unload symbols from system shared libraries, to
+# avoid conflicts with the minsyms in the program.  E.g.,
+# intl/plural-exp.h has 'enum expression_operator {..., mult, ...}'.
+
+proc nodebug_runto {func} {
+    with_test_prefix $func {
+	if ![runto $func] {
+	    return false
+	}
+	gdb_test_no_output "nosharedlibrary" \
+	    "unload symbols from system libraries"
+	return true
+    }
+}
+
 # Test calling no-debug functions involving argument types that may
 # require coercion/promotion, both prototyped and unprototyped, both
 # return-type-cast style, and function-pointer-cast styles.
@@ -73,7 +88,7 @@ proc test_call_promotion {} {
     gdb_test "p /d ((uint8 (*) ()) add8_noproto)((uint8) 2, (uint8) 3)" " = 5"
 }
 
-if [runto inner] then {
+if [nodebug_runto inner] then {
     
     # Expect to find global/local symbols in each of text/data/bss.
     
@@ -273,7 +288,7 @@ if [runto inner] then {
 
     # Now, try that we can give names of file-local symbols which happen
     # to be unique, and have it still work
-    if [runto middle] then {
+    if [nodebug_runto middle] then {
 	gdb_test "backtrace 10" "#0.*middle.*#1.*top.*#2.*main.*" \
 	    "backtrace from middle in nodebug.exp"
     }