diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/ProjectExplorer.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/ProjectExplorer.java
index b7bac26db78..7cdc773159e 100644
--- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/ProjectExplorer.java
+++ b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/ProjectExplorer.java
@@ -265,6 +265,7 @@ public void waitProjectExplorerDisappearance(int timeout) {
public void waitProjectExplorer(int timeout) {
try {
seleniumWebDriverHelper.waitVisibility(By.id(PROJECT_EXPLORER_TREE_ITEMS), timeout);
+ loader.waitOnClosed();
} catch (TimeoutException ex) {
// remove try-catch block after issue has been resolved
if (seleniumWebDriverHelper.isVisible(By.id("ide-loader-progress-bar"))) {
diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Refactor.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Refactor.java
index 5bcb07df843..2e6d9998506 100644
--- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Refactor.java
+++ b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Refactor.java
@@ -45,12 +45,14 @@
import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf;
import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfAllElementsLocatedBy;
import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
+import static org.testng.Assert.fail;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.che.selenium.core.SeleniumWebDriver;
import org.openqa.selenium.By;
import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
import org.openqa.selenium.support.PageFactory;
@@ -235,7 +237,12 @@ public void waitRenameMethodFormIsOpen() {
/** wait the 'Rename Method' form is closed */
public void waitRenameMethodFormIsClosed() {
- elementWait.until(invisibilityOfElementLocated(By.xpath(RENAME_METHOD_FORM)));
+ try {
+ elementWait.until(invisibilityOfElementLocated(By.xpath(RENAME_METHOD_FORM)));
+ } catch (TimeoutException ex) {
+ // remove try-catch block after issue has been resolved
+ fail("Known issue: https://github.com/eclipse/che/issues/10784", ex);
+ }
}
/** wait the 'Rename Field' form is open */
diff --git a/selenium/che-selenium-test/src/test/resources/suites/CheOneThreadTestsSuite.xml b/selenium/che-selenium-test/src/test/resources/suites/CheOneThreadTestsSuite.xml
index 81bbfa088d5..a444b3e26bd 100644
--- a/selenium/che-selenium-test/src/test/resources/suites/CheOneThreadTestsSuite.xml
+++ b/selenium/che-selenium-test/src/test/resources/suites/CheOneThreadTestsSuite.xml
@@ -65,6 +65,7 @@
+
diff --git a/selenium/che-selenium-test/src/test/resources/suites/CheSuite.xml b/selenium/che-selenium-test/src/test/resources/suites/CheSuite.xml
index fad183c019f..c32299bd764 100644
--- a/selenium/che-selenium-test/src/test/resources/suites/CheSuite.xml
+++ b/selenium/che-selenium-test/src/test/resources/suites/CheSuite.xml
@@ -67,7 +67,6 @@
-