diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 44d9a6df4ff..16eb95a1772 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2000-02-16  Tom Tromey  <tromey@cygnus.com>
 
+	* libjava.jni/calls.c: New file.
+	* libjava.jni/calls.out: New file.
+	* libjava.jni/calls.java: New file.
+
 	* libjava.jni/throwit.java: New file.
 	* libjava.jni/throwit.c: New file.
 	* libjava.jni/throwit.out: New file.
diff --git a/libjava/testsuite/libjava.jni/calls.c b/libjava/testsuite/libjava.jni/calls.c
new file mode 100644
index 00000000000..c125941076a
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/calls.c
@@ -0,0 +1,69 @@
+#include <stdio.h>
+#include <calls.h>
+
+jint
+Java_calls_docall (JNIEnv *env, jobject _this)
+{
+  jmethodID method;
+  jclass klass, super;
+
+  jbyte b;
+  jshort s;
+  jchar c;
+  jint i;
+  jlong l;
+  jfloat f;
+  jdouble d;
+
+  jvalue val;
+
+  jint fails = 0;
+
+  klass = (*env)->GetObjectClass (env, _this);
+  super = (*env)->GetSuperclass (env, klass);
+
+  method = (*env)->GetMethodID (env, klass, "byte_f", "()B");
+  b = (*env)->CallByteMethod (env, _this, method);
+  if (b != 23)
+    ++fails;
+
+  method = (*env)->GetMethodID (env, klass, "char_f", "(I)C");
+  val.i = 10;
+  c = (*env)->CallCharMethodV (env, _this, method, &val);
+  if (c != ('a' + 10))
+    ++fails;
+
+  method = (*env)->GetMethodID (env, super, "int_f", "()I");
+  i = (*env)->CallNonvirtualIntMethod (env, _this, super, method);
+  if (i != 27)
+    ++fails;
+
+  i = (*env)->CallIntMethod (env, _this, method);
+  if (i != 1023)
+    ++fails;
+
+  method = (*env)->GetStaticMethodID (env, klass, "long_f", "(J)J");
+  l = (*env)->CallStaticLongMethod (env, klass, method, (jlong) 10);
+  if (l != 2033)
+    ++fails;
+
+  method = (*env)->GetMethodID (env, klass, "void_f", "()V");
+  (*env)->CallVoidMethod (env, _this, method);
+
+  method = (*env)->GetStaticMethodID (env, klass, "short_f", "()S");
+  s = (*env)->CallStaticShortMethod (env, klass, method);
+  if (s != 2)
+    ++fails;
+
+  method = (*env)->GetMethodID (env, klass, "double_f", "()D");
+  d = (*env)->CallDoubleMethod (env, _this, method);
+  if (d != -1.0)
+    ++fails;
+
+  method = (*env)->GetMethodID (env, klass, "float_f", "()F");
+  f = (*env)->CallFloatMethod (env, _this, method);
+  if (f != 1.0)
+    ++fails;
+
+  return fails;
+}
diff --git a/libjava/testsuite/libjava.jni/calls.java b/libjava/testsuite/libjava.jni/calls.java
new file mode 100644
index 00000000000..b98017c0c13
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/calls.java
@@ -0,0 +1,66 @@
+// Test a bunch of different calls.
+
+class base
+{
+  public int int_f ()
+  {
+    return 27;
+  }
+}
+
+public class calls extends base
+{
+  static
+  {
+    System.loadLibrary ("calls");
+  }
+
+  public native int docall ();
+
+  public byte byte_f ()
+  {
+    return 23;
+  }
+
+  public char char_f (int z)
+  {
+    return (char) ('a' + z);
+  }
+
+  public int int_f ()
+  {
+    return 1023;
+  }
+
+  public static long long_f (long q)
+  {
+    return q + 2023;
+  }
+
+  public void void_f ()
+  {
+    System.out.println ("void");
+  }
+
+  public static short short_f ()
+  {
+    return 2;
+  }
+
+  public double double_f ()
+  {
+    return -1.0;
+  }
+
+  public float float_f ()
+  {
+    return (float) 1.0;
+  }
+
+  public static void main (String[] args)
+  {
+    calls c = new calls ();
+    if (c.docall () != 0)
+      System.out.println ("fail");
+  }
+}
diff --git a/libjava/testsuite/libjava.jni/calls.out b/libjava/testsuite/libjava.jni/calls.out
new file mode 100644
index 00000000000..cbab1f6b63a
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/calls.out
@@ -0,0 +1 @@
+void