diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 58eaf20808..063489cbf2 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/break-on-linker-gcd-function.exp: Replace
+	prepare_for_testing by build_executable_from_specs and clean_restart.
+
 2013-06-27  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.base/testenv.exp, gdb.base/tui-layout.exp,
diff --git a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
index 7a4ef83682..f9b844fbf0 100644
--- a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
+++ b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
@@ -32,12 +32,15 @@ if [get_compiler_info "c++"] {
 }
 
 set additional_flags {-ffunction-sections -Wl,--gc-sections}
-if {[prepare_for_testing $testfile.exp $testfile $srcfile \
-	 [list debug c++ additional_flags=$additional_flags]]} {
+if {[build_executable_from_specs $testfile.exp $testfile \
+       {c++ additional_flags=-Wl,--gc-sections} \
+       $srcfile {debug c++ additional_flags=-ffunction-sections}]} {
     untested $testfile.exp
     return -1
 }
 
+clean_restart $testfile
+
 # Single hex digit
 set xd {[0-9a-f]}