diff --git a/pom.xml b/pom.xml
index 1e0e23a24844bd22629eb4854c33acb9d9d51b4d..52994f73520a7a83d4624e45696688172124bd56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -301,7 +301,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <version>2.8.1</version>
             <configuration>
-              <argLine>-Xmx1024m -Xms1024m</argLine>
+              <argLine>-XX:MaxPermSize=256m -Xmx1024m -Xms1024m</argLine>
             	<systemPropertyVariables>
 								<java.io.tmpdir>${project.build.directory}/olatdata</java.io.tmpdir>
 							</systemPropertyVariables>
@@ -365,7 +365,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <version>2.8.1</version>
             <configuration>
-              <argLine>-Xmx512m -Xms512m</argLine>
+              <argLine>-XX:MaxPermSize=256m -Xmx1024m -Xms1024m</argLine>
             	<systemPropertyVariables>
 								<java.io.tmpdir>${project.build.directory}/olatdata</java.io.tmpdir>
 							</systemPropertyVariables>
@@ -589,7 +589,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <version>2.8.1</version>
             <configuration>
-              <argLine>-Xmx512m -Xms512m</argLine>
+              <argLine>-XX:MaxPermSize=256m -Xmx1024m -Xms1024m</argLine>
             	<systemPropertyVariables>
 								<java.io.tmpdir>${project.build.directory}/olatdata</java.io.tmpdir>
 							</systemPropertyVariables>
diff --git a/src/test/java/org/olat/portfolio/PortfolioModuleTest.java b/src/test/java/org/olat/portfolio/PortfolioModuleTest.java
index 8f8736ca3c488811c9b91d37a76da3fe81ddc16f..b3b8cd7afecfa0bb0b16b4a56d7e0789161dc37e 100644
--- a/src/test/java/org/olat/portfolio/PortfolioModuleTest.java
+++ b/src/test/java/org/olat/portfolio/PortfolioModuleTest.java
@@ -113,12 +113,6 @@ public class PortfolioModuleTest extends OlatTestCase {
 		//////////////////////////////////
 		portfolioModule.setEnableArtefactHandler(dummyHandler, false);
 		
-		try {//wait until the event is send
-			Thread.sleep(100);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		
 		//found in the list of all available handlers
 		List<EPArtefactHandler<?>> allHandlers = portfolioModule.getAllAvailableArtefactHandlers();
 		boolean foundInAll = false;
@@ -150,12 +144,6 @@ public class PortfolioModuleTest extends OlatTestCase {
 		//////////////////////////////////
 		portfolioModule.setEnableArtefactHandler(dummyHandler, false);
 		
-		try {//wait until the event is send
-			Thread.sleep(100);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		
 		//found in the list of all available handlers
 		allHandlers = portfolioModule.getAllAvailableArtefactHandlers();
 		foundInAll = false;
@@ -215,6 +203,7 @@ public class PortfolioModuleTest extends OlatTestCase {
 	}
 	
 	public class DummyArtefact extends AbstractArtefact {
+		private static final long serialVersionUID = -7986085106701245624L;
 		public static final String TYPE = "dummy";
 
 		@Override