diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d4e7d8b6707..8cd3c511941 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-06-21  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.base/index-cache.exp: Add additional_flags=-Wl,--build-id.
+
 2019-06-21  Tom de Vries  <tdevries@suse.de>
 
 	PR testsuite/24518
diff --git a/gdb/testsuite/gdb.base/index-cache.exp b/gdb/testsuite/gdb.base/index-cache.exp
index 075dffe3f5e..6f1488e0371 100644
--- a/gdb/testsuite/gdb.base/index-cache.exp
+++ b/gdb/testsuite/gdb.base/index-cache.exp
@@ -18,7 +18,8 @@
 
 standard_testfile
 
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
+	  {additional_flags=-Wl,--build-id}] } {
     return
 }