Index: core/xwiki-core/pom.xml
===================================================================
--- core/xwiki-core/pom.xml	(revision 27357)
+++ core/xwiki-core/pom.xml	(working copy)
@@ -823,10 +823,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <!-- Prevent Out Of Memory errors resulting from tests that do no free up the memory correctly -->
-          <forkMode>pertest</forkMode>
-        </configuration>
       </plugin>      
       <!-- Publish a Core Test JAR -->
       <plugin>
Index: core/xwiki-core/src/test/java/com/xpn/xwiki/test/AbstractBridgedXWikiComponentTestCase.java
===================================================================
--- core/xwiki-core/src/test/java/com/xpn/xwiki/test/AbstractBridgedXWikiComponentTestCase.java	(revision 27357)
+++ core/xwiki-core/src/test/java/com/xpn/xwiki/test/AbstractBridgedXWikiComponentTestCase.java	(working copy)
@@ -80,6 +80,7 @@
     protected void tearDown() throws Exception
     {
         Utils.setComponentManager(null);
+        getContext().clear();
         super.tearDown();
     }