diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c5204388d1c..173747fb31d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-22  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one):
+	Link against -ljvm, not -lgcj.
+
 2006-06-22  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* Makefile.am (libjvm_la_LDFLAGS): Do not set -rpath to
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 6cd677d77aa..0ed8a5aaba2 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -258,7 +258,7 @@ proc gcj_jni_invocation_test_one {file} {
   # -dylib_file option, but that's complicated, and it's much easier
   # to just make the linker find libgcc using -L options.
   if { [istarget "*-*-darwin*"] } {
-      set cxxflags "-L../.libs -shared-libgcc -lgcj -liconv"
+      set cxxflags "-L../.libs -shared-libgcc -ljvm -liconv"
   } else {
       global LIBJAVA
       if [info exists LIBJAVA] {
@@ -266,7 +266,7 @@ proc gcj_jni_invocation_test_one {file} {
       } else {
 	  set libjava [libjava_find_lib libjava gcj]
       }
-      set cxxflags "$libjava -lgcj"
+      set cxxflags "$libjava -ljvm"
   }
 
   if { [istarget "*-*-solaris*"] } {