diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 6e7897bdc2f..058f9ab90eb 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-20  Tom Tromey  <tromey@cygnus.com>
+
+	* libjava.jni/throwit.out: Fixed output to be correct.
+
+	* libjava.jni/noclass.java (main): `find_it' throws an exception.
+
 2000-04-16  Anthony Green  <green@redhat.com>
 
 	* libjava.compile/PR209.java: New file.
diff --git a/libjava/testsuite/libjava.jni/noclass.java b/libjava/testsuite/libjava.jni/noclass.java
index cfa1178f03c..7e0b8c34cca 100644
--- a/libjava/testsuite/libjava.jni/noclass.java
+++ b/libjava/testsuite/libjava.jni/noclass.java
@@ -11,8 +11,15 @@ public class noclass
 
   public static void main (String[] args)
   {
-    find_it ();
-    // If find_it() causes a crash, we won't be running this next line.
-    System.out.println ("Ok");
+    try
+      {
+	find_it ();
+      }
+    catch (Throwable _)
+      {
+	// If find_it() causes a crash, or doesn't throw an exception,
+	// we won't be running this next line.
+	System.out.println ("Ok");
+      }
   }
 }
diff --git a/libjava/testsuite/libjava.jni/throwit.out b/libjava/testsuite/libjava.jni/throwit.out
index 8c75e99fcbd..c50b7a9abbc 100644
--- a/libjava/testsuite/libjava.jni/throwit.out
+++ b/libjava/testsuite/libjava.jni/throwit.out
@@ -1,4 +1,4 @@
 class java.lang.UnknownError
-the word is zardoz
-class java.lang.Throwable
 zardoz is the word
+class java.lang.Throwable
+the word is zardoz