diff --git a/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java b/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java
index bfd885a75abf76fad35738c288bc9cf384aa425f..ac49c803197a3bd3f8a370ae88e29bef1bcbdcb7 100644
--- a/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java
+++ b/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java
@@ -1122,7 +1122,7 @@ public class FunctionalRepositorySiteUtil {
 		
 		selectorBuffer.append("xpath=//div[contains(@class, '")
 		.append(getRepositoryPopupCss())
-		.append("')]//form//input[@type='text']");
+		.append("')]//input[@type='text']");
 		
 		functionalUtil.waitForPageToLoadElement(browser, selectorBuffer.toString());
 		browser.type(selectorBuffer.toString(), title);
@@ -1135,7 +1135,7 @@ public class FunctionalRepositorySiteUtil {
 		
 		selectorBuffer.append("xpath=(//div[contains(@class, '")
 		.append(getRepositoryPopupCss())
-		.append("')]//form//div[contains(@class, '")
+		.append("')]//div[contains(@class, '")
 		.append(getRepositorySaveDetailsCss())
 		.append("')]//button[contains(@class, '")
 		.append(functionalUtil.getButtonDirtyCss())
diff --git a/src/test/java/org/olat/util/FunctionalUtil.java b/src/test/java/org/olat/util/FunctionalUtil.java
index 680fc26cd1d395021dd9d43acf6c82f12962b884..ff3d23984ed3a5054a99091eb2c329ac34b0b05a 100644
--- a/src/test/java/org/olat/util/FunctionalUtil.java
+++ b/src/test/java/org/olat/util/FunctionalUtil.java
@@ -47,14 +47,14 @@ public class FunctionalUtil {
 	public final static String LOGIN_PAGE = "dmz";
 	public final static String ACKNOWLEDGE_CHECKBOX = "acknowledge_checkbox";
 
-	public final static long TIMEOUT = 60000;
-	public final static long POLL_INTERVAL = 100;
+	public final static long TIMEOUT = 20000;
+	public final static long POLL_INTERVAL = 200;
 	
 	public enum WaitLimitAttribute {
 		NORMAL("10000"),
-		EXTENDED("20000"),
-		SAVE("30000"),
-		VERY_SAVE("60000");
+		EXTENDED("15000"),
+		SAVE("20000"),
+		VERY_SAVE("30000");
 		
 		private String extend;
 		private long extendAsLong;