diff --git a/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/client/TestWorkspaceServiceClient.java b/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/client/TestWorkspaceServiceClient.java
index bb973bf3cd2..985069db05f 100644
--- a/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/client/TestWorkspaceServiceClient.java
+++ b/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/client/TestWorkspaceServiceClient.java
@@ -41,6 +41,7 @@
 import org.eclipse.che.selenium.core.workspace.MemoryMeasure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.Assert;
 
 /**
  * @author Musienko Maxim
@@ -210,7 +211,13 @@ public void sendStartRequest(String workspaceId, String workspaceName) throws Ex
   public void start(String workspaceId, String workspaceName, TestUser workspaceOwner)
       throws Exception {
     sendStartRequest(workspaceId, workspaceName);
-    waitStatus(workspaceName, workspaceOwner.getName(), RUNNING);
+
+    try {
+      waitStatus(workspaceName, workspaceOwner.getName(), RUNNING);
+    } catch (IllegalStateException ex) {
+      // Remove try-catch block after issue has been resolved
+      Assert.fail("Known issue https://github.com/eclipse/che/issues/8031");
+    }
   }
 
   /** Gets workspace by its id. */