--- jsr166/src/test/tck/TreeMapTest.java	2009/11/21 17:38:06	1.11
+++ jsr166/src/test/tck/TreeMapTest.java	2009/12/01 06:03:49	1.12
@@ -660,7 +660,7 @@ public class TreeMapTest extends JSR166T
         assertEquals(1, sm.size());
         assertEquals(three, sm.firstKey());
         assertEquals(three, sm.lastKey());
-        assertTrue(sm.remove(three) != null);
+        assertEquals("C", sm.remove(three));
         assertTrue(sm.isEmpty());
         assertEquals(3, map.size());
     }
@@ -693,7 +693,7 @@ public class TreeMapTest extends JSR166T
         assertEquals(4, map.size());
         assertEquals(0, sm.size());
         assertTrue(sm.isEmpty());
-        assertTrue(sm.remove(three) == null);
+        assertSame(sm.remove(three), null);
         assertEquals(4, map.size());
     }
 
@@ -775,7 +775,7 @@ public class TreeMapTest extends JSR166T
         NavigableMap ssm = sm.tailMap(four, true);
         assertEquals(four, ssm.firstKey());
         assertEquals(five, ssm.lastKey());
-        assertTrue(ssm.remove(four) != null);
+        assertEquals("D", ssm.remove(four));
         assertEquals(1, ssm.size());
         assertEquals(3, sm.size());
         assertEquals(4, map.size());