diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/DocumentViewer/exampleEncodedDocs.js b/app/client/cypress/fixtures/exampleEncodedDocs.js
similarity index 100%
rename from app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/DocumentViewer/exampleEncodedDocs.js
rename to app/client/cypress/fixtures/exampleEncodedDocs.js
diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Git/GitImport/ImportEmptyRepo_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Git/GitImport/ImportEmptyRepo_spec.js
index aba0bb13bd..2169a749c6 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Git/GitImport/ImportEmptyRepo_spec.js
+++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Git/GitImport/ImportEmptyRepo_spec.js
@@ -7,6 +7,19 @@ describe("Git import empty repository", function() {
   const assertConnectFailure = true;
   const failureMessage =
     "git import failed. \nDetails: Cannot import app from an empty repo";
+  before(() => {
+    cy.NavigateToHome();
+    cy.createWorkspace();
+    cy.wait("@createWorkspace").then((interception) => {
+      const newWorkspaceName = interception.response.body.data.name;
+      cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
+    });
+    cy.generateUUID().then((uid) => {
+      repoName = uid;
+      _.gitSync.CreateTestGiteaRepo(repoName);
+      //cy.createTestGithubRepo(repoName);
+    });
+  });
 
   it("Bug #12749 Git Import - Empty Repo NullPointerException", () => {
     cy.get(homePage.homeIcon).click();
diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js
index 3b8c9cf659..296e957a96 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js
+++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js
@@ -8,12 +8,19 @@ let repoName;
 
 describe("Tests JS Library with Git", () => {
   before(() => {
+    cy.NavigateToHome();
+    cy.createWorkspace();
+    cy.wait("@createWorkspace").then((interception) => {
+      const newWorkspaceName = interception.response.body.data.name;
+      cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
+    });
     // connect app to git
     _.gitSync.CreateNConnectToGit(repoName);
     cy.get("@gitRepoName").then((repName) => {
       repoName = repName;
     });
   });
+
   it("1. Install JS Library and commit changes, create branch and verify JS library changes are present on new branch ", () => {
     _.entityExplorer.ExpandCollapseEntity("Libraries");
     _.installer.openInstaller();
diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Templates/ForkTemplateToGitConnectedApp.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Templates/ForkTemplateToGitConnectedApp.js
index 1cf242e8e1..a7d67e1205 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Templates/ForkTemplateToGitConnectedApp.js
+++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Templates/ForkTemplateToGitConnectedApp.js
@@ -2,7 +2,7 @@ import template from "../../../../locators/TemplatesLocators.json";
 import gitSyncLocators from "../../../../locators/gitSyncLocators";
 import widgetLocators from "../../../../locators/Widgets.json";
 let repoName;
-let appId;
+let newWorkspaceName;
 let branchName = "test/template";
 const jsObject = "Utils";
 const homePage = require("../../../../locators/HomePage");
@@ -11,10 +11,10 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 describe("Fork a template to the current app", () => {
   before(() => {
     cy.NavigateToHome();
-    cy.generateUUID().then((id) => {
-      appId = id;
-      cy.CreateAppInFirstListedWorkspace(id);
-      localStorage.setItem("AppName", appId);
+    cy.createWorkspace();
+    cy.wait("@createWorkspace").then((interception) => {
+      newWorkspaceName = interception.response.body.data.name;
+      cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
     });
     _.gitSync.CreateNConnectToGit(repoName);
     cy.get("@gitRepoName").then((repName) => {
@@ -90,7 +90,7 @@ describe("Fork a template to the current app", () => {
       cy.NavigateToHome();
       cy.get(homePage.searchInput)
         .clear()
-        .type(appId);
+        .type(newWorkspaceName);
       cy.wait(2000);
       cy.get(homePage.applicationCard)
         .first()
diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/DocumentViewer/DocumentViewer_spec.ts b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/DocumentViewer/DocumentViewer_spec.ts
index ab85f9264e..cddd7a81bd 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/DocumentViewer/DocumentViewer_spec.ts
+++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/DocumentViewer/DocumentViewer_spec.ts
@@ -1,5 +1,5 @@
 import { ObjectsRegistry } from "../../../../../support/Objects/Registry";
-import { encodedWordDoc, encodedXlsxDoc } from "./exampleEncodedDocs";
+import { encodedWordDoc, encodedXlsxDoc } from "../../../../../fixtures/exampleEncodedDocs";
 const ee = ObjectsRegistry.EntityExplorer,
   locator = ObjectsRegistry.CommonLocators,
   deployMode = ObjectsRegistry.DeployMode,