diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 93e2e41325..c5bdddb8f1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-03  Tom de Vries  <tdevries@suse.de>
+
+	* boards/cc-with-gdb-index.exp: New file.
+
 2019-05-02  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.rust/simple.exp: Add new test case.
diff --git a/gdb/testsuite/boards/cc-with-gdb-index.exp b/gdb/testsuite/boards/cc-with-gdb-index.exp
new file mode 100644
index 0000000000..910e0acca1
--- /dev/null
+++ b/gdb/testsuite/boards/cc-with-gdb-index.exp
@@ -0,0 +1,26 @@
+# Copyright 2019 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This file is a dejagnu "board file" and is used to run the testsuite
+# with contrib/cc-with-tweaks.sh -i.
+#
+# Example usage:
+# bash$ cd $objdir
+# bash$ make check-gdb \
+#   RUNTESTFLAGS='--target_board=cc-with-gdb-index'
+#
+
+set CC_WITH_TWEAKS_FLAGS "-i"
+load_board_description "cc-with-tweaks"