diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7b202c5b1d65975016af37b677c44d498e8fe374..924f6c4de1f9dc115907dac2b1af5e2915e37e4a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
 1999-05-07  Tom Tromey  <tromey@cygnus.com>
 
+	* mauve-libgcj: Don't omit Utf8Encoding or StringTest.
+	Comment out FieldPosition, ParsePosition, and SimpleDateFormat
+	again (oops).
+
 	* mauve-libgcj: Test more from java.text.  Don't mention 1.1 tests
 	(we pick those up already).
 
diff --git a/libjava/mauve-libgcj b/libjava/mauve-libgcj
index 24c50af9f0f56e2d0e7a2a646134a2dd28a73bd1..727968dcbf706c6165694be3cf42c24c50f06d23 100644
--- a/libjava/mauve-libgcj
+++ b/libjava/mauve-libgcj
@@ -4,21 +4,20 @@ JDK1.1
 !java.applet
 !java.awt
 !java.beans
-!java.io.Utf8Encoding
 java.lang.Character.classify12
 java.lang.String.hash
-# StringTest includes a test for NullPointerException, which we don't
-# handle.
-!java.lang.String.StringTest
 !java.math
 !java.net
 !java.rmi
 !java.security
 !java.sql
 java.text.StringCharacterIterator.iter
-java.text.FieldPosition.Test
-java.text.ParsePosition.Test
-java.text.SimpleDateFormat.getAndSet2DigitYearStart
+# FIXME: can't enable these until we eliminate compiler bug.
+# (The bug is in javac, not gcj, so this really has to wait until
+# we can compile mauve with gcj -C.)
+# java.text.FieldPosition.Test
+# java.text.ParsePosition.Test
+# java.text.SimpleDateFormat.getAndSet2DigitYearStart
 !java.text.ACIAttribute
 !java.text.AttributedCharacterIterator
 !java.text.resources