diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoDbFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoDbFactory.java
index 35f521a0a..939b93b3c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoDbFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoDbFactory.java
@@ -2,6 +2,7 @@ package org.springframework.data.document.mongodb;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.DisposableBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.util.Assert;
@@ -9,7 +10,7 @@ import org.springframework.util.Assert;
 import com.mongodb.DB;
 import com.mongodb.Mongo;
 
-public class SimpleMongoDbFactory implements MongoDbFactory {
+public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
   /**
    * Logger, available to subclasses.
@@ -57,4 +58,11 @@ public class SimpleMongoDbFactory implements MongoDbFactory {
     return MongoDbUtils.getDB(mongo, dbName, username, password == null ? null : password.toCharArray());
   }
 
+  /**
+   * Clean up the Mongo instance.
+   */
+  public void destroy() throws Exception {
+	mongo.close();
+  }
+
 }