diff --git a/src/test/com/mongodb/JavaClientTest.java b/src/test/com/mongodb/JavaClientTest.java
index 8ed525db231..f99550e774f 100644
--- a/src/test/com/mongodb/JavaClientTest.java
+++ b/src/test/com/mongodb/JavaClientTest.java
@@ -684,6 +684,8 @@ public void testFindAndModify(){
         assertEquals( 5 , dbObj.get( "x" ));
         assertNull( c.findOne(new BasicDBObject( "_id" , 1 ) ));
 
+        // remove something that does not exist, should return null
+        assertNull( c.findAndRemove( new BasicDBObject("no_such_field", "value")) );
         // test exception throwing
         try {
             dbObj = c.findAndModify( null, null );