diff --git a/src/main/java/org/olat/core/logging/LogFileParser.java b/src/main/java/org/olat/core/logging/LogFileParser.java
index 7591096b3c67cc011d028a677b5261fe2a0db4ac..49662bdc486290f7d8b611d63302443fec4c1af2 100644
--- a/src/main/java/org/olat/core/logging/LogFileParser.java
+++ b/src/main/java/org/olat/core/logging/LogFileParser.java
@@ -60,8 +60,8 @@ public class LogFileParser extends LogDelegator {
 			} else {
 				logfilepathBase = logdir + File.separator + filename;
 			}
-		}else {
-			//todo if java.io.tmpdir is in use the log gets written to catalina.out....
+		} else {
+			logfilepathBase = System.getProperty("java.io.tmpdir") + File.separator + "logs" + File.separator + filename;
 		}		
 		log = getLogger();
 	}
diff --git a/src/test/java/org/olat/portfolio/PortfolioModuleTest.java b/src/test/java/org/olat/portfolio/PortfolioModuleTest.java
index 663826d2ca6649c0cbe440ccbd15d606e3c4d1f6..8f8736ca3c488811c9b91d37a76da3fe81ddc16f 100644
--- a/src/test/java/org/olat/portfolio/PortfolioModuleTest.java
+++ b/src/test/java/org/olat/portfolio/PortfolioModuleTest.java
@@ -22,10 +22,10 @@
 package org.olat.portfolio;
 
 
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
 
 import java.util.List;
 
@@ -113,6 +113,12 @@ 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;
@@ -144,6 +150,12 @@ 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;