diff --git a/tests/commands/configuration-management/config-validate.spec.ts b/tests/commands/configuration-management/config-validate.spec.ts
index 7e5b3756..a98e87c5 100644
--- a/tests/commands/configuration-management/config-validate.spec.ts
+++ b/tests/commands/configuration-management/config-validate.spec.ts
@@ -7,6 +7,7 @@ import { testContext } from "../../utls/test-context";
 import { loggingTestTransport } from "../../jest.setup";
 import { SchemaValidationResponse } from "../../../src/commands/configuration-management/interfaces/package-validation.interfaces";
 import { getJsonFromFile } from "../../utls/fs-utils";
+import * as fs from "fs";
 
 describe("Config validate", () => {
 
@@ -170,6 +171,8 @@ describe("Config validate", () => {
 
         mockAxiosPost(VALIDATE_URL, response);
 
+        const mockWriteFileSync = jest.spyOn(fs, "writeFileSync");
+
         await new PackageValidationService(testContext).validatePackage("my-package", ["DATA_PIPELINES"], null, true);
 
         expect(mockWriteFileSync).toHaveBeenCalledWith(
diff --git a/tests/core/utils/file.service.spec.ts b/tests/core/utils/file.service.spec.ts
index ec5c492b..dcd71be6 100644
--- a/tests/core/utils/file.service.spec.ts
+++ b/tests/core/utils/file.service.spec.ts
@@ -12,27 +12,18 @@ describe("FileService", () => {
     const symLinkSourceTempDir = path.join(os.tmpdir(), "file-service-symlink-source");
 
     beforeAll(() => {
-        fileService = new FileService();
-
-        if (!fs.existsSync(tempDir)) {
-            fs.mkdirSync(tempDir, { recursive: true, mode: 0o700 });
-        }
+        rmTempDir(tempDir);
+        rmTempDir(symLinkSourceTempDir);
 
-        if (!fs.existsSync(symLinkSourceTempDir)) {
-            fs.mkdirSync(symLinkSourceTempDir, { recursive: true, mode: 0o700 });
-        }
+        fs.mkdirSync(tempDir, { recursive: true, mode: 0o700 });
+        fs.mkdirSync(symLinkSourceTempDir, { recursive: true, mode: 0o700 });
 
         fileService = new FileService();
     });
 
     afterAll(() => {
-        if (fs.existsSync(tempDir)) {
-            rmTempDir(tempDir);
-        }
-
-        if (fs.existsSync(symLinkSourceTempDir)) {
-            rmTempDir(tempDir);
-        }
+        rmTempDir(tempDir);
+        rmTempDir(symLinkSourceTempDir);
     });
 
     describe("zipDirectoryInBatchExportFormat", () => {