diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2da69ace28..2bfe39b376 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-22  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.java/jmain.exp: Use standard_testfile.
+	* gdb.java/jmisc.exp: Use standard_testfile.
+	* gdb.java/jnpe.exp: Use standard_testfile.
+	* gdb.java/jprint.exp: Use standard_testfile.
+
 2012-06-22  Tom Tromey  <tromey@redhat.com>
 
 	* lib/gdb.exp (default_gdb_init): Set gdb_test_file_name.
diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp
index 8bb82b15e3..aba1e5ae63 100644
--- a/gdb/testsuite/gdb.java/jmain.exp
+++ b/gdb/testsuite/gdb.java/jmain.exp
@@ -20,10 +20,8 @@ load_lib "java.exp"
 
 if { [skip_java_tests] } { continue }
 
-set testfile "jmain"
-set srcfile ${srcdir}/$subdir/${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if {[compile_java_from_source ${srcfile} ${binfile} "-g"] != ""} {
+standard_testfile .java
+if {[compile_java_from_source $srcdir/$subdir/$srcfile $binfile "-g"] != ""} {
     continue
 }
 
diff --git a/gdb/testsuite/gdb.java/jmisc.exp b/gdb/testsuite/gdb.java/jmisc.exp
index 9ca35b8f35..72158613ea 100644
--- a/gdb/testsuite/gdb.java/jmisc.exp
+++ b/gdb/testsuite/gdb.java/jmisc.exp
@@ -20,10 +20,8 @@ load_lib "java.exp"
 
 if { [skip_java_tests] } { continue }
 
-set testfile "jmisc"
-set srcfile ${srcdir}/$subdir/${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if {[compile_java_from_source ${srcfile} ${binfile} "-g"] != ""} {
+standard_testfile .java
+if {[compile_java_from_source $srcdir/$subdir/$srcfile $binfile "-g"] != ""} {
     continue
 }
 
diff --git a/gdb/testsuite/gdb.java/jnpe.exp b/gdb/testsuite/gdb.java/jnpe.exp
index dc76bc82c1..f7225d80df 100644
--- a/gdb/testsuite/gdb.java/jnpe.exp
+++ b/gdb/testsuite/gdb.java/jnpe.exp
@@ -15,10 +15,8 @@
 
 load_lib "java.exp"
 
-set testfile "jnpe"
-set srcfile ${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [compile_java_from_source ${srcdir}/$subdir/${srcfile} ${binfile} "-g"] != "" } {
+standard_testfile .java
+if  { [compile_java_from_source $srcdir/$subdir/$srcfile $binfile "-g"] != "" } {
     untested "Couldn't compile ${srcdir}/$subdir/${srcfile}"
     return -1
 }
diff --git a/gdb/testsuite/gdb.java/jprint.exp b/gdb/testsuite/gdb.java/jprint.exp
index 131dd47cd9..b2d5d310cc 100644
--- a/gdb/testsuite/gdb.java/jprint.exp
+++ b/gdb/testsuite/gdb.java/jprint.exp
@@ -20,10 +20,8 @@ load_lib "java.exp"
 
 if { [skip_java_tests] } { continue }
 
-set testfile "jprint"
-set srcfile ${srcdir}/$subdir/${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if {[compile_java_from_source ${srcfile} ${binfile} "-g"] != ""} {
+standard_testfile .java
+if {[compile_java_from_source $srcdir/$subdir/$srcfile $binfile "-g"] != ""} {
     continue
 }