diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6e7efd7870..73d79a94c6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* gdb.java/jprint.exp: New test case for java inferior call.
+	* gdb.java/jprint.java: Ditto.
+
 2004-09-15  Joel Brobecker  <brobecker@gnat.com>
 
 	* gdb.base/bigcore.exp: Deactivate on IRIX targets.
diff --git a/gdb/testsuite/gdb.java/jprint.exp b/gdb/testsuite/gdb.java/jprint.exp
new file mode 100644
index 0000000000..0268f87fcd
--- /dev/null
+++ b/gdb/testsuite/gdb.java/jprint.exp
@@ -0,0 +1,80 @@
+# Copyright 2004 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 2 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+
+# This file was written by Jeff Johnston. (jjohnstn@redhat.com)
+#
+
+if $tracelevel then {
+	strace $tracelevel
+}
+
+load_lib "java.exp"
+
+set testfile "jprint"
+set srcfile ${srcdir}/$subdir/${testfile}.java
+set binfile ${objdir}/${subdir}/${testfile}
+if  { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } {
+    untested "Couldn't compile ${srcfile}"
+    return -1
+}
+
+# Set the current language to java.  This counts as a test.  If it
+# fails, then we skip the other tests.
+
+proc set_lang_java {} {
+    global gdb_prompt
+    global binfile objdir subdir
+
+    verbose "loading file '$binfile'"
+    gdb_load $binfile
+
+    send_gdb "set language java\n"
+    gdb_expect {
+	-re ".*$gdb_prompt $" {}
+	timeout { fail "set language java (timeout)" ; return 0 }
+    }
+
+    return [gdb_test "show language" ".* source language is \"java\".*" \
+	"set language to \"java\""]
+}
+
+set prms_id 0
+set bug_id 0
+
+# Start with a fresh gdb.
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+
+gdb_test "set print sevenbit-strings" ".*"
+
+if ![set_lang_java] then {
+    # Ref PR gdb:java/1565.  Don't use the simpler "break jmisc.main".
+    # As of 2004-02-24 it wasn't working and is being tested separatly.
+    runto "\'${testfile}.main(java.lang.String\[\])\'"
+
+    gdb_test "p jvclass.addprint(4,5,6)" "sum is 15\r\n.*" "unambiguous static call"
+
+    gdb_test "next" ""
+    gdb_test "next" ""
+
+    gdb_test "p x.print(44)" "x is 44\r\n.*" "single argument print call"
+    gdb_test "p x.print(22,33)" "y is 33\r\n.*" "double argument print call"
+    gdb_test "call x.dothat(55)" "new value is 58\r\n.*= 62.*" "virtual fn call"
+    gdb_test "p x.addprint(1,2,3)" "sum is 6\r\n.*" "inherited static call"
+    gdb_test "call x.addk(44)" "adding k gives 121\r\n.*= 121.*" "inherited virtual fn call"
+}
diff --git a/gdb/testsuite/gdb.java/jprint.java b/gdb/testsuite/gdb.java/jprint.java
new file mode 100644
index 0000000000..f17607efe7
--- /dev/null
+++ b/gdb/testsuite/gdb.java/jprint.java
@@ -0,0 +1,62 @@
+// jprint.java test program.
+//
+// Copyright 2004
+// Free Software Foundation, Inc.
+//
+// Written by Jeff Johnston <jjohnstn@redhat.com> 
+// Contributed by Red Hat
+//
+// This file is part of GDB.
+//
+// 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 2 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, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+class jvclass {
+  public static int k;
+  static {
+    k = 77;
+  }
+  public static void addprint (int x, int y, int z) {
+    int sum = x + y + z;
+    System.out.println ("sum is " + sum);
+  }
+
+  public int addk (int x) {
+    int sum = x + k;
+    System.out.println ("adding k gives " + sum);
+    return sum;
+  }
+}
+    
+public class jprint extends jvclass {
+  public int dothat (int x) {
+    int y = x + 3;
+    System.out.println ("new value is " + y);
+    return y + 4;
+  }
+  public static void print (int x) {
+    System.out.println("x is " + x);
+  }
+  public static void print (int x, int y) {
+    System.out.println("y is " + y);
+  }
+  public static void main(String[] args) {
+    jprint x = new jprint ();
+    x.print (44);
+    print (k, 33);
+  }
+}
+
+