diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
index 8369f9d5809..7a5dbfe93d2 100755
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
@@ -54,11 +54,9 @@ public class TransientCompetitorStoreImpl implements CompetitorStore, Serializab
     
     private transient WeakHashMap<Competitor, CompetitorWithoutBoatDTO> weakCompetitorDTOCache;
 
-
     private final Set<Boat> boatsToUpdateDuringGetOrCreate;
     
     private transient WeakHashMap<Boat, BoatDTO> weakBoatDTOCache;
- 
     
     private final NamedReentrantReadWriteLock lock;
 
@@ -69,7 +67,6 @@ public class TransientCompetitorStoreImpl implements CompetitorStore, Serializab
         competitorsToUpdateDuringGetOrCreate = new HashSet<Competitor>();
         weakCompetitorDTOCache = new WeakHashMap<Competitor, CompetitorWithoutBoatDTO>();
         competitorUpdateListeners = Collections.synchronizedSet(new HashSet<CompetitorStore.CompetitorUpdateListener>());
-
         boatCache = new HashMap<Serializable, Boat>();
         boatsByIdAsString = new HashMap<String, Boat>();
         boatsToUpdateDuringGetOrCreate = new HashSet<Boat>();
diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadCompetitorsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadCompetitorsTest.java
index aafbfcec91f..ff3156e43f6 100755
--- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadCompetitorsTest.java
+++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadCompetitorsTest.java
@@ -72,11 +72,14 @@ public class StoreAndLoadCompetitorsTest extends AbstractMongoDBTest {
         domainFactory = new DomainFactoryImpl((srlid)->null);
     }
     
-    private void dropCompetitorCollection() {
+    private void dropCompetitorAndBoatsCollection() {
         DB db = getMongoService().getDB();
-        DBCollection competitorCollection = db.getCollection(CollectionNames.COMPETITORS_BAK.name());
+        DBCollection competitorCollection = db.getCollection(CollectionNames.COMPETITORS.name());
         competitorCollection.setWriteConcern(WriteConcern.SAFE); // ensure that the drop() has happened
         competitorCollection.drop();
+        DBCollection boatsCollection = db.getCollection(CollectionNames.BOATS.name());
+        boatsCollection.setWriteConcern(WriteConcern.SAFE); // ensure that the drop() has happened
+        boatsCollection.drop();
     }
     
     @Test
@@ -90,7 +93,7 @@ public class StoreAndLoadCompetitorsTest extends AbstractMongoDBTest {
 
         MongoObjectFactory mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(getMongoService());
         DomainObjectFactory domainObjectFactory = PersistenceFactory.INSTANCE.getDomainObjectFactory(getMongoService(), domainFactory);
-        dropCompetitorCollection();
+        dropCompetitorAndBoatsCollection();
         
         DynamicCompetitor c = (DynamicCompetitor) createCompetitor(competitorName1);
         c.setShortName(competitorShortName1);
@@ -121,7 +124,7 @@ public class StoreAndLoadCompetitorsTest extends AbstractMongoDBTest {
     public void testStoreAndUpdateCompetitorWithUUIDAsId() {
         MongoObjectFactory mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(getMongoService());
         DomainObjectFactory domainObjectFactory = PersistenceFactory.INSTANCE.getDomainObjectFactory(getMongoService(), domainFactory);
-        dropCompetitorCollection();
+        dropCompetitorAndBoatsCollection();
 
         DynamicCompetitor c = (DynamicCompetitor) createCompetitor("Hasso", UUID.randomUUID());
         mongoObjectFactory.storeCompetitor(c);
@@ -135,7 +138,7 @@ public class StoreAndLoadCompetitorsTest extends AbstractMongoDBTest {
     public void testStoreAndRemoveCompetitor() {
         MongoObjectFactory mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(getMongoService());
         DomainObjectFactory domainObjectFactory = PersistenceFactory.INSTANCE.getDomainObjectFactory(getMongoService(), domainFactory);
-        dropCompetitorCollection();
+        dropCompetitorAndBoatsCollection();
         
         DynamicCompetitor c = (DynamicCompetitor) createCompetitor("Hasso");
         mongoObjectFactory.storeCompetitor(c);
@@ -149,7 +152,7 @@ public class StoreAndLoadCompetitorsTest extends AbstractMongoDBTest {
     public void testStoreAndRemoveCompetitorWithUUIDAsId() {
         MongoObjectFactory mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(getMongoService());
         DomainObjectFactory domainObjectFactory = PersistenceFactory.INSTANCE.getDomainObjectFactory(getMongoService(), domainFactory);
-        dropCompetitorCollection();
+        dropCompetitorAndBoatsCollection();
         
         DynamicCompetitor c = (DynamicCompetitor) createCompetitor("Hasso", UUID.randomUUID());
         mongoObjectFactory.storeCompetitor(c);