diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 89823c1fed61c90501da86c3a5e7a31a65a39486..96e9a2b8468692f25a1ff936935fd76ca37385cd 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-06  Mark Wielaard  <mark@klomp.org>
+
+	* libjava.mauve/mauve.exp: Use libgcj.jar not libgcj.zip.
+	* libjava.mauve/xfails: add Character.classify12 (number 1),
+	Character.getType (number 11), Character.getType (number 20) and
+	Character.getType (number 22). We implement 1.4 Character.
+
 2002-03-28  Andrew Haley  <aph@redhat.com>
 
 	* libjava.lang/Throw_2.java: New.
diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp
index 3a1cecc8915e0187a6653ffa89e779760c17aab8..4a26b27242dbf55ace607035ff4ee9e46a2187e3 100644
--- a/libjava/testsuite/libjava.mauve/mauve.exp
+++ b/libjava/testsuite/libjava.mauve/mauve.exp
@@ -89,7 +89,7 @@ proc test_mauve {} {
 
     # Append -B and -I so that libgcj.spec and libgcj.zip are found
     # before they're installed.
-    set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$objdir/../libgcj.zip"
+    set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$objdir/../libgcj.jar"
 
   if {[catch {
     system "$env(MAUVEDIR)/configure --with-gcj 2>&1"
diff --git a/libjava/testsuite/libjava.mauve/xfails b/libjava/testsuite/libjava.mauve/xfails
index 0d5c28ccabb1a23876d1640cb866480607af04ba..bb52a0b771bd8e84c0fc886ceb9cbb33ef9ec0e5 100644
--- a/libjava/testsuite/libjava.mauve/xfails
+++ b/libjava/testsuite/libjava.mauve/xfails
@@ -27,6 +27,10 @@ FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Six Bytes (1) (number 1)
 FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Orphan Continuation (1) (number 1)
 FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Orphan Continuation (2) (number 1)
 FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Four Byte Range Error (2) (number 1)
+FAIL: gnu.testlet.java.lang.Character.classify12 (number 1)
+FAIL: gnu.testlet.java.lang.Character.getType (number 11)
+FAIL: gnu.testlet.java.lang.Character.getType (number 20)
+FAIL: gnu.testlet.java.lang.Character.getType (number 22)
 FAIL: gnu.testlet.java.text.DateFormatSymbols.Test: patterns (number 2)
 FAIL: gnu.testlet.java.text.SimpleDateFormat.Test: equals() (number 1)
 FAIL: gnu.testlet.java.text.SimpleDateFormat.Test: parse() strict (number 1)