diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 64f59c58a20..fc5627b34f4 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-02  Tom Tromey  <tromey@redhat.com>
 
+	* libjava.lang/initexc.java (fail): Static initializers must be
+	able to complete normally.  From Eric Blake.
+
 	* libjava.lang/initexc.java: New file.
 	* libjava.lang/initexc.out: New file.
 
diff --git a/libjava/testsuite/libjava.lang/initexc.java b/libjava/testsuite/libjava.lang/initexc.java
index 968009e45e1..eda24ab033f 100644
--- a/libjava/testsuite/libjava.lang/initexc.java
+++ b/libjava/testsuite/libjava.lang/initexc.java
@@ -4,7 +4,9 @@ public class initexc
   {
     static
     {
-      throw new NullPointerException("nope");
+      // Static initializers must be able to complete normally.
+      if (true)
+	throw new NullPointerException("nope");
     }
 
     public static int val ()