diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
index 1c55ffdf1..f65cc9176 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
@@ -120,21 +120,29 @@ public abstract class AbstractRepositoryPurgeTest
 
         previousArchivaConfiguration = ( (DefaultManagedRepositoryAdmin) applicationContext.getBean(
             ManagedRepositoryAdmin.class ) ).getArchivaConfiguration();
+
+        removeMavenIndexes();
     }
 
     @After
     public void tearDown()
         throws Exception
+    {
+        removeMavenIndexes();
+        super.tearDown();
+        config = null;
+        repo = null;
+
+    }
+
+    protected void removeMavenIndexes()
+        throws Exception
     {
         NexusIndexer nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
         for ( IndexingContext indexingContext : nexusIndexer.getIndexingContexts().values() )
         {
             nexusIndexer.removeIndexingContext( indexingContext, false );
         }
-        super.tearDown();
-        config = null;
-        repo = null;
-
     }
 
     public ManagedRepository getRepoConfiguration( String repoId, String repoName )