diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fa1f567ad4e..e1c2bfa95ca 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-01  Tom de Vries  <tdevries@suse.de>
+
+	* boards/dwarf4-gdb-index.exp: Use cc-with-tweaks.exp.
+
 2019-04-30  Ali Tamur  <tamur@google.com>
 
 	* lib/dwarf.exp(): Added DW_FORM_strx1-4.
diff --git a/gdb/testsuite/boards/dwarf4-gdb-index.exp b/gdb/testsuite/boards/dwarf4-gdb-index.exp
index 7885f350490..25e0aa029fe 100644
--- a/gdb/testsuite/boards/dwarf4-gdb-index.exp
+++ b/gdb/testsuite/boards/dwarf4-gdb-index.exp
@@ -19,25 +19,7 @@
 # Example usage:
 # bash$ make check RUNTESTFLAGS='--target_board=dwarf4-gdb-index'
 
-# This is needed otherwise dejagnu tries to rsh to host "dwarf4-gdb-index".
-load_board_description "local-board"
-
-# This is based on baseboards/unix.exp.
-# At the moment we only support systems that unix.exp supports.
-load_generic_config "unix"
-process_multilib_options ""
-set found_gcc [find_gcc]
-set found_gxx [find_g++]
-set_board_info compiler "$found_gcc"
+set CC_WITH_TWEAKS_FLAGS "-i"
+load_board_description "cc-with-tweaks"
 
 set_board_info debug_flags "-gdwarf-4 -fdebug-types-section"
-
-set contrib_dir [file normalize $srcdir/../contrib]
-if ![info exists CC_FOR_TARGET] {
-    set CC_FOR_TARGET "$found_gcc"
-}
-set CC_FOR_TARGET "$contrib_dir/cc-with-tweaks.sh -i $CC_FOR_TARGET"
-if ![info exists CXX_FOR_TARGET] {
-    set CXX_FOR_TARGET "$found_gxx"
-}
-set CXX_FOR_TARGET "$contrib_dir/cc-with-tweaks.sh -i $CXX_FOR_TARGET"