diff --git a/src/test/java/school/redrover/FreestyleProjectTest.java b/src/test/java/school/redrover/FreestyleProjectTest.java
index b75e14352..b6e501354 100644
--- a/src/test/java/school/redrover/FreestyleProjectTest.java
+++ b/src/test/java/school/redrover/FreestyleProjectTest.java
@@ -1,7 +1,5 @@
 package school.redrover;
 
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
@@ -299,10 +297,12 @@ public void testAddParameterForParameterizationOfBuilds() {
         Assert.assertTrue(selectedParameterList.contains(parameterName));
     }
 
-    @Test(dependsOnMethods = "testCreate")
+    @Test
     public void testNavigationToWorkspaceAfterBuild() {
         final String expectedHeadingText = "Workspace of " + PROJECT_NAME + " on Built-In Node";
 
+        createFreestyleProject(PROJECT_NAME);
+
         String actualHeadingText = new HomePage(getDriver())
                 .openProject(PROJECT_NAME, new FreestyleProjectStatusPage(getDriver()))
                 .getSidebarComponent()
@@ -313,4 +313,27 @@ public void testNavigationToWorkspaceAfterBuild() {
 
         Assert.assertEquals(actualHeadingText, expectedHeadingText);
     }
+
+    @Test
+    public void testErrorMessageForProjectWithNoWorkspace() {
+        final String expectedHeadingText = "Error: no workspace";
+
+        createFreestyleProject(PROJECT_NAME);
+
+        String actualHeadingText = new HomePage(getDriver())
+                .openProject(PROJECT_NAME, new FreestyleProjectStatusPage(getDriver()))
+                .getSidebarComponent()
+                .clickSidebarWorkspace()
+                .getHeaderText();
+
+        Assert.assertEquals(actualHeadingText, expectedHeadingText);
+    }
+
+    private void createFreestyleProject(String name) {
+        new HomePage(getDriver())
+                .clickCreateJob()
+                .sendName(name)
+                .selectFreestyleProjectAndSubmit()
+                .gotoHomePage();
+    }
 }