diff --git a/e2e/files/happy-path/happy-path-workspace.yaml b/e2e/files/happy-path/happy-path-workspace.yaml
index bf33859be3..69972bad14 100644
--- a/e2e/files/happy-path/happy-path-workspace.yaml
+++ b/e2e/files/happy-path/happy-path-workspace.yaml
@@ -6,7 +6,7 @@ projects:
   - name: petclinic
     source:
       type: git
-      location: 'https://github.com/spring-projects/spring-petclinic.git'
+      location: "https://github.com/spring-projects/spring-petclinic.git"
 components:
   - type: cheEditor
     id: eclipse/che-theia/next
@@ -28,8 +28,8 @@ components:
   - type: dockerimage
     alias: maven-container
     image: bujhtr5555/maven-with-artifacts:latest
-    command: ['sleep']
-    args: ['infinity']
+    command: ["sleep"]
+    args: ["infinity"]
     env:
       - name: MAVEN_CONFIG
         value: /home/user/.m2
@@ -44,13 +44,13 @@ commands:
     actions:
       - type: exec
         component: maven-container
-        command: mvn clean package >> build.txt
+        command: mvn clean package >> build.txt && tail -n 40 /projects/petclinic/build.txt | grep 'BUILD SUCCESS' > /projects/petclinic/result-build.txt
         workdir: /projects/petclinic
   - name: build-file-output
     actions:
       - type: exec
         component: maven-container
-        command: 'mkdir -p /projects/petclinic/?/.m2 && cp -r /.m2/* /projects/petclinic/?/.m2 && cd /projects/petclinic && mvn package >> build-output.txt'
+        command: mkdir -p /projects/petclinic/?/.m2 && cp -r /.m2/* /projects/petclinic/?/.m2 && cd /projects/petclinic && mvn package >> build-output.txt && tail -n 40 /projects/petclinic/build-output.txt | grep 'BUILD SUCCESS' > /projects/petclinic/result-build-output.txt
         workdir: /projects/petclinic
   - name: run
     actions:
diff --git a/e2e/tests/e2e_happy_path/HappyPath.spec.ts b/e2e/tests/e2e_happy_path/HappyPath.spec.ts
index 429cb5c61b..004fd07acf 100644
--- a/e2e/tests/e2e_happy_path/HappyPath.spec.ts
+++ b/e2e/tests/e2e_happy_path/HappyPath.spec.ts
@@ -147,8 +147,13 @@ suite('Language server validation', async () => {
 suite('Validation of workspace build and run', async () => {
     test('Build application', async () => {
         await runTask('che: build-file-output');
-        await projectTree.expandPathAndOpenFileInAssociatedWorkspace(projectName, 'build-output.txt');
-        await editor.followAndWaitForText('build-output.txt', '[INFO] BUILD SUCCESS', 300000, 10000);
+
+        //workaround for issue: https://github.com/eclipse/che/issues/14771
+        
+        // await projectTree.expandPathAndOpenFileInAssociatedWorkspace(projectName, 'build-output.txt');
+        await projectTree.expandPathAndOpenFileInAssociatedWorkspace(projectName, 'result-build-output.txt', 220000);
+        await editor.waitText('result-build-output.txt', '[INFO] BUILD SUCCESS');
+        // await editor.followAndWaitForText('build-output.txt', '[INFO] BUILD SUCCESS', 300000, 10000);
     });
 
     test('Run application', async () => {
@@ -188,11 +193,18 @@ suite('Display source code changes in the running application', async () => {
 
     test('Build application with changes', async () => {
         await runTask('che: build');
-        await projectTree.expandPathAndOpenFileInAssociatedWorkspace(projectName, 'build.txt');
+        await projectTree.expandPathAndOpenFileInAssociatedWorkspace(projectName, 'result-build.txt', 300000);
+        await editor.waitText('result-build.txt', '[INFO] BUILD SUCCESS');
+        
+        //workaround for issue: https://github.com/eclipse/che/issues/14771
+
+        /*await projectTree.expandPathAndOpenFileInAssociatedWorkspace(projectName, 'build.txt');
         await editor.waitEditorAvailable('build.txt');
         await editor.clickOnTab('build.txt');
         await editor.waitTabFocused('build.txt');
-        await editor.followAndWaitForText('build.txt', '[INFO] BUILD SUCCESS', 300000, 5000);
+        await editor.followAndWaitForText('build.txt', '[INFO] BUILD SUCCESS', 300000, 5000);*/
+
+
     });
 
     test('Run application with changes', async () => {