diff --git a/src/test/java/org/olat/selenium/UserTest.java b/src/test/java/org/olat/selenium/UserTest.java
index ed244bacfbef0741f42349a22f00f9c9255cd3d6..9275bf4cdb0ab93dc267fc398c95eb81897fc009 100644
--- a/src/test/java/org/olat/selenium/UserTest.java
+++ b/src/test/java/org/olat/selenium/UserTest.java
@@ -216,13 +216,13 @@ public class UserTest {
 		//login again
 		loginPage
 			.assertOnLoginPage()
-			.loginAs(user.getLogin(), user.getPassword());
+			.loginAs(user.getLogin(), user.getPassword())
+			//check that we are really logged in
+			.assertLoggedIn(user);
 		
-		//check that we don't see the resume button
+		//and check that we don't see the resume button
 		List<WebElement> resumeButtons = browser.findElements(LoginPage.resumeButton);
 		Assert.assertTrue(resumeButtons.isEmpty());
-		//double check that we are really logged in
-		loginPage.assertLoggedIn(user);
 	}
 	
 
diff --git a/src/test/java/org/olat/selenium/page/portfolio/EntryPage.java b/src/test/java/org/olat/selenium/page/portfolio/EntryPage.java
index 78b42b8ba9471c9fe71c86525a80c0ca723080f0..be0470c9e4faf9c2a7437311c7b16fcf63838362 100644
--- a/src/test/java/org/olat/selenium/page/portfolio/EntryPage.java
+++ b/src/test/java/org/olat/selenium/page/portfolio/EntryPage.java
@@ -88,7 +88,8 @@ public class EntryPage {
 		
 		By inputBy = By.cssSelector("fieldset.o_sel_pf_collect_image_form .o_fileinput input[type='file']");
 		OOGraphene.uploadFile(inputBy, image, browser);
-		OOGraphene.waitingALittleLonger();//wait event
+		By previewBy = By.cssSelector("div.o_filepreview>div.o_image>img");
+		OOGraphene.waitElement(previewBy, 5, browser);
 		
 		By titleBy = By.cssSelector("fieldset.o_sel_pf_collect_image_form .o_sel_pf_collect_title input[type='text']");
 		browser.findElement(titleBy).sendKeys(title);