diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/RepositoryIndexCreationIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/RepositoryIndexCreationIntegrationTests.java
index 126b616c8..70c793d33 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/RepositoryIndexCreationIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/RepositoryIndexCreationIntegrationTests.java
@@ -49,7 +49,20 @@ public class RepositoryIndexCreationIntegrationTests {
 	
 	@After
 	public void tearDown() {
-		operations.dropCollection(Person.class);
+		operations.execute(Person.class, new CollectionCallback<Void>() {
+
+			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				
+				for (DBObject index : collection.getIndexInfo()) {
+					String indexName = index.get("name").toString();
+					if (indexName.startsWith("find")) {
+						collection.dropIndex(indexName);
+					}
+				}
+				
+				return null;
+			}
+		});
 	}
 	
 	@Test