diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index dbbcfa2b9f1..279ff40a05e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-05  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.arch/i386-bp_permanent.exp: Use standard_testfile.
+
 2014-12-04  Doug Evans  <dje@google.com>
 
 	* gdb.python/py-objfile.exp: Add tests for
diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
index 833b4ed75ef..50ccf98bee5 100644
--- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
+++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
@@ -23,9 +23,7 @@ if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
     return
 }
 
-set testfile "i386-bp_permanent"
-set srcfile i386-bp_permanent.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
 # some targets have leading underscores on assembly symbols.
 set additional_flags [gdb_target_symbol_prefix_flags]