diff --git a/src/test/java/org/olat/selenium/CourseTest.java b/src/test/java/org/olat/selenium/CourseTest.java
index 1aaf15f41d6e32fdb06c78b423933728d9408c34..5283966b94287b3c00e68208089f138cfe3d5589 100644
--- a/src/test/java/org/olat/selenium/CourseTest.java
+++ b/src/test/java/org/olat/selenium/CourseTest.java
@@ -585,14 +585,14 @@ public class CourseTest {
 		loginPage.loginAs(author.getLogin(), author.getPassword());
 		
 		//create a course
-		String courseTitle = "Course-With-Podcast-" + UUID.randomUUID().toString();
+		String courseTitle = "Course-With-Podcast-" + UUID.randomUUID();
 		navBar
 			.openAuthoringEnvironment()
 			.createCourse(courseTitle)
 			.clickToolbarBack();
 		
 		String podcastNodeTitle = "Podcats-1";
-		String podcastTitle = "Podcast - " + UUID.randomUUID().toString();
+		String podcastTitle = "Podcast - " + UUID.randomUUID();
 		
 		//create a course element of type CP with the CP that we create above
 		CourseEditorPageFragment courseEditor = CoursePageFragment.getCourse(browser)
@@ -622,8 +622,10 @@ public class CourseTest {
 		FeedPage feed = FeedPage.getFeedPage(browser);
 		feed.newExternalPodcast("http://pod.drs.ch/rock_special_mpx.xml");
 
-		//check only that the "episodes" title is visibel
-		WebElement episodeH4 = browser.findElement(By.cssSelector("div.o_podcast_episodes>h4.o_title"));
+		//check only that the "episodes" title is visible
+		By episodeTitleby = By.cssSelector("div.o_podcast_episodes>h4.o_title");
+		OOGraphene.waitElement(episodeTitleby, 5, browser);
+		WebElement episodeH4 = browser.findElement(episodeTitleby);
 		Assert.assertNotNull(episodeH4);
 	}
 	
@@ -675,7 +677,9 @@ public class CourseTest {
 		feed.newExternalBlog("http://www.openolat.com/feed/");
 
 		//check only that the subscription link is visible
-		WebElement subscriptionLink = browser.findElement(By.cssSelector("div.o_subscription>a"));
+		By subscriptionBy = By.cssSelector("div.o_subscription>a");
+		OOGraphene.waitElement(subscriptionBy, 10, browser);
+		WebElement subscriptionLink = browser.findElement(subscriptionBy);
 		Assert.assertTrue(subscriptionLink.isDisplayed());
 	}
 
diff --git a/src/test/java/org/olat/selenium/page/forum/ForumPage.java b/src/test/java/org/olat/selenium/page/forum/ForumPage.java
index ec0d4d8866685a736378313fab8d7d93bc7bc0af..eb5df89d7875a30d3e152d92c2ab1f54e9a9956e 100644
--- a/src/test/java/org/olat/selenium/page/forum/ForumPage.java
+++ b/src/test/java/org/olat/selenium/page/forum/ForumPage.java
@@ -117,9 +117,10 @@ public class ForumPage {
 		
 		//save
 		By saveBy = By.cssSelector("div.modal-content form button.btn-primary");
-		WebElement saveButton = browser.findElement(saveBy);
-		saveButton.click();
+		browser.findElement(saveBy).click();
 		OOGraphene.waitBusy(browser);
+		By messageTitleBy = By.xpath("//div[contains(@class,'o_forum_message')][//h4[contains(text(),'" + title + "')]]");
+		OOGraphene.waitElement(messageTitleBy, 5, browser);
 		return this;
 	}
 	
@@ -220,8 +221,8 @@ public class ForumPage {
 	 */
 	public ArtefactWizardPage addAsArtfeact() {
 		By addAsArtefactBy = By.className("o_eportfolio_add");
-		WebElement addAsArtefactButton = browser.findElement(addAsArtefactBy);
-		addAsArtefactButton.click();
+		OOGraphene.waitElement(addAsArtefactBy, 5, browser);
+		browser.findElement(addAsArtefactBy).click();
 		OOGraphene.waitBusy(browser);
 		return ArtefactWizardPage.getWizard(browser);
 	}
diff --git a/src/test/java/org/olat/selenium/page/portfolio/ArtefactWizardPage.java b/src/test/java/org/olat/selenium/page/portfolio/ArtefactWizardPage.java
index 2e6b5644c4f6a0ca1832b1261324fcb25a66d201..84913a153a67b22eaaeb371387c791d8dc2fb5a6 100644
--- a/src/test/java/org/olat/selenium/page/portfolio/ArtefactWizardPage.java
+++ b/src/test/java/org/olat/selenium/page/portfolio/ArtefactWizardPage.java
@@ -93,8 +93,8 @@ public class ArtefactWizardPage {
 	
 	public ArtefactWizardPage fillArtefactMetadatas(String title, String description) {
 		By titleBy = By.cssSelector(".o_sel_ep_artefact_metadata_title input");
-		WebElement titleEl = browser.findElement(titleBy);
-		titleEl.sendKeys(title);
+		OOGraphene.waitElement(titleBy, 10, browser);
+		browser.findElement(titleBy).sendKeys(title);
 		
 		OOGraphene.tinymce(description, browser);		
 		return this;
diff --git a/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java b/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
index bd1f79c0dddc6dc247f989069a29f1833c99184d..379aa13060404547510dea6555888ea2f40b8ddf 100644
--- a/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
+++ b/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
@@ -72,9 +72,10 @@ public class CatalogAdminPage {
 		
 		//save
 		By saveBy = By.cssSelector(".o_sel_catalog_add_category_popup .o_sel_catalog_entry_form_buttons button.btn-primary");
-		WebElement saveButton = browser.findElement(saveBy);
-		saveButton.click();
+		browser.findElement(saveBy).click();
 		OOGraphene.waitBusy(browser);
+		By nodeTitleBy = By.xpath("//div[contains(@class,'o_meta')]//h4[contains(@class,'o_title')]//a/span[contains(text(),'" + title + "')]");
+		OOGraphene.waitElement(nodeTitleBy, 5, browser);
 		return this;
 	}