diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7b889fe606c1..522a3f9b0344 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-21  Mark Wielaard  <mark@klomp.org>
+
+	* mauve-libgcj: Don't run java.lang.ref tests since they are buggy.
+
 2002-04-19  David S. Miller  <davem@redhat.com>
 
 	* include/dwarf2-signal.h (SIGNAL_HANDLER): Name siginfo_t pointer
diff --git a/libjava/mauve-libgcj b/libjava/mauve-libgcj
index c6443d75e459..165f0b6f5ee3 100644
--- a/libjava/mauve-libgcj
+++ b/libjava/mauve-libgcj
@@ -27,3 +27,7 @@ JDBC2.0
 # Character.unicode seems to be very broken (the test)
 # Does not give meaningfull test results at the moment.
 !java.lang.Character.unicode
+
+# These are almost certainly buggy test cases.
+# The behaviour of the garbarge collector cannot be predicted.
+!java.lang.ref
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 3700ceb21f11..c6af713af177 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-21  Mark Wielaard  <mark@klomp.org>
+
+	* libjava.mauve/xfail: Expect failures for PR java/6391 and
+	libgcj/6389.
+
 2002-04-16  Mark Wielaard  <mark@klomp.org>
 
 	* libjava.lang/negzero.java: New.
diff --git a/libjava/testsuite/libjava.mauve/xfails b/libjava/testsuite/libjava.mauve/xfails
index 14d5b4bda518..eff94d698808 100644
--- a/libjava/testsuite/libjava.mauve/xfails
+++ b/libjava/testsuite/libjava.mauve/xfails
@@ -34,8 +34,12 @@ FAIL: gnu.testlet.java.lang.Character.getType (number 20)
 FAIL: gnu.testlet.java.lang.Character.getType (number 22)
 FAIL: gnu.testlet.java.lang.Class.ClassTest: Error: test_getClassLoader failed - 1 (number 1)
 FAIL: gnu.testlet.java.lang.Class.ClassTest: Error: test_getClassLoader failed - 2 (number 1)
+FAIL: gnu.testlet.java.lang.Double.DoubleTest: Error: test_intValue returned wrong results CYGNUS: Float to int conversions - 1 (number 1)
+FAIL: gnu.testlet.java.lang.Double.DoubleTest: Error: test_longValue returned wrong results CYGNUS: Float to int conversions - 1 (number 1)
+FAIL: gnu.testlet.java.lang.Float.FloatTest: Error: test_intValue returned wrong results - 1 (number 1)
 FAIL: gnu.testlet.java.lang.String.CASE_INSENSITIVE_ORDER: unicode mappings (number 1)
 FAIL: gnu.testlet.java.lang.String.CASE_INSENSITIVE_ORDER: unicode mappings (number 2)
+FAIL: gnu.testlet.java.lang.System.getProperty: '' (number 1)
 FAIL: gnu.testlet.java.text.AttributedString.Test: Attribute key count (number 1)
 FAIL: gnu.testlet.java.text.DateFormatSymbols.Test: patterns (number 2)
 FAIL: gnu.testlet.java.text.SimpleDateFormat.Test: equals() (number 1)