diff --git a/src/test/java/org/olat/selenium/PortfolioTest.java b/src/test/java/org/olat/selenium/PortfolioTest.java
index 331a7a02da5f8a6c5eba5ac95c9d80c3cfcee795..6068c4e4c12655232234eabff70973929e0a5924 100644
--- a/src/test/java/org/olat/selenium/PortfolioTest.java
+++ b/src/test/java/org/olat/selenium/PortfolioTest.java
@@ -42,7 +42,6 @@ import org.olat.selenium.page.NavigationPage;
 import org.olat.selenium.page.course.CourseEditorPageFragment;
 import org.olat.selenium.page.course.CoursePageFragment;
 import org.olat.selenium.page.forum.ForumPage;
-import org.olat.selenium.page.graphene.OOGraphene;
 import org.olat.selenium.page.portfolio.ArtefactWizardPage;
 import org.olat.selenium.page.portfolio.PortfolioPage;
 import org.olat.selenium.page.repository.AuthoringEnvPage;
@@ -806,14 +805,14 @@ public class PortfolioTest {
 		loginPage
 			.loginAs(author.getLogin(), author.getPassword())
 			.resume();
-		String courseTitle = "Course-With-Portfolio-" + UUID.randomUUID().toString();
+		String courseTitle = "Course-With-Portfolio-" + UUID.randomUUID();
 		navBar
 			.openAuthoringEnvironment()
 			.createCourse(courseTitle)
 			.clickToolbarBack();
 		
 		String portfolioNodeTitle = "Template-EP-1";
-		String portfolioTitle = "Template - EP - " + UUID.randomUUID().toString();
+		String portfolioTitle = "Template - EP - " + UUID.randomUUID();
 		
 		//create a course element of type CP with the CP that we create above
 		CourseEditorPageFragment courseEditor = CoursePageFragment.getCourse(browser)
@@ -833,9 +832,6 @@ public class PortfolioTest {
 			.selectFirstPageInEditor()
 			.setPage(pageTitle, "With a little description")
 			.createStructureElement(structureElementTitle, "Structure description");
-		
-		OOGraphene.waitAndCloseBlueMessageWindow(browser);
-		
 		//open course
 		navBar.openCourse(courseTitle);
 		
diff --git a/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java b/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java
index 8041acc9ef9b5612a31e356c42f66793f241537a..9639ed095776d12d59f5a1322d9025a718964e13 100644
--- a/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java
+++ b/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java
@@ -499,6 +499,7 @@ public class CourseEditorPageFragment {
 		modal.findElement(AuthoringEnvPage.displayNameInput).sendKeys(displayName);
 		modal.findElement(AuthoringEnvPage.createSubmit).click();
 		OOGraphene.waitBusy(browser);
+		OOGraphene.waitAndCloseBlueMessageWindow(browser);
 		return this;
 	}