diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.examples.test.ts
index a7f5a1804a..901f3e5011 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.examples.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.examples.test.ts
@@ -15,44 +15,41 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import mockFs from 'mock-fs';
-import os from 'os';
 import { Writable } from 'stream';
 import { createDebugLogAction } from './log';
 import { join } from 'path';
 import yaml from 'yaml';
 import { examples } from './log.examples';
+import { createMockDirectory } from '@backstage/backend-test-utils';
 
 describe('debug:log examples', () => {
   const logStream = {
     write: jest.fn(),
   } as jest.Mocked<Partial<Writable>> as jest.Mocked<Writable>;
 
-  const mockTmpDir = os.tmpdir();
+  const mockDir = createMockDirectory();
+  const workspacePath = mockDir.resolve('workspace');
+
   const mockContext = {
     input: {},
     baseUrl: 'somebase',
-    workspacePath: mockTmpDir,
+    workspacePath,
     logger: getVoidLogger(),
     logStream,
     output: jest.fn(),
-    createTemporaryDirectory: jest.fn().mockResolvedValue(mockTmpDir),
+    createTemporaryDirectory: jest.fn(),
   };
 
   const action = createDebugLogAction();
 
   beforeEach(() => {
-    mockFs({
-      [`${mockContext.workspacePath}/README.md`]: '',
-      [`${mockContext.workspacePath}/a-directory/index.md`]: '',
+    mockDir.setContent({
+      [`${workspacePath}/README.md`]: '',
+      [`${workspacePath}/a-directory/index.md`]: '',
     });
     jest.resetAllMocks();
   });
 
-  afterEach(() => {
-    mockFs.restore();
-  });
-
   it('should log message', async () => {
     const context = {
       ...mockContext,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts
index 6b7ad8816f..d6fc5174b3 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts
@@ -15,43 +15,40 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import mockFs from 'mock-fs';
-import os from 'os';
 import { Writable } from 'stream';
 import { createDebugLogAction } from './log';
 import { join } from 'path';
 import yaml from 'yaml';
+import { createMockDirectory } from '@backstage/backend-test-utils';
 
 describe('debug:log', () => {
   const logStream = {
     write: jest.fn(),
   } as jest.Mocked<Partial<Writable>> as jest.Mocked<Writable>;
 
-  const mockTmpDir = os.tmpdir();
+  const mockDir = createMockDirectory();
+  const workspacePath = mockDir.resolve('workspace');
+
   const mockContext = {
     input: {},
     baseUrl: 'somebase',
-    workspacePath: mockTmpDir,
+    workspacePath,
     logger: getVoidLogger(),
     logStream,
     output: jest.fn(),
-    createTemporaryDirectory: jest.fn().mockResolvedValue(mockTmpDir),
+    createTemporaryDirectory: jest.fn(),
   };
 
   const action = createDebugLogAction();
 
   beforeEach(() => {
-    mockFs({
+    mockDir.setContent({
       [`${mockContext.workspacePath}/README.md`]: '',
       [`${mockContext.workspacePath}/a-directory/index.md`]: '',
     });
     jest.resetAllMocks();
   });
 
-  afterEach(() => {
-    mockFs.restore();
-  });
-
   it('should do nothing', async () => {
     await action.handler(mockContext);
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.examples.test.ts
index 595ae7c3b6..11cc83c696 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.examples.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.examples.test.ts
@@ -15,12 +15,11 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import mockFs from 'mock-fs';
 import { createWaitAction } from './wait';
 import { Writable } from 'stream';
-import os from 'os';
 import { examples } from './wait.examples';
 import yaml from 'yaml';
+import { createMockDirectory } from '@backstage/backend-test-utils';
 
 describe('debug:wait examples', () => {
   const action = createWaitAction();
@@ -29,25 +28,23 @@ describe('debug:wait examples', () => {
     write: jest.fn(),
   } as jest.Mocked<Partial<Writable>> as jest.Mocked<Writable>;
 
-  const mockTmpDir = os.tmpdir();
+  const mockDir = createMockDirectory();
+  const workspacePath = mockDir.resolve('workspace');
+
   const mockContext = {
     input: {},
     baseUrl: 'somebase',
-    workspacePath: mockTmpDir,
+    workspacePath,
     logger: getVoidLogger(),
     logStream,
     output: jest.fn(),
-    createTemporaryDirectory: jest.fn().mockResolvedValue(mockTmpDir),
+    createTemporaryDirectory: jest.fn(),
   };
 
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
-  afterEach(() => {
-    mockFs.restore();
-  });
-
   it('should wait for specified period of seconds', async () => {
     const context = {
       ...mockContext,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.test.ts
index 0d4cdaba4b..6f80604a6d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.test.ts
@@ -15,10 +15,9 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import mockFs from 'mock-fs';
 import { createWaitAction } from './wait';
 import { Writable } from 'stream';
-import os from 'os';
+import { createMockDirectory } from '@backstage/backend-test-utils';
 
 describe('debug:wait', () => {
   const action = createWaitAction();
@@ -27,25 +26,23 @@ describe('debug:wait', () => {
     write: jest.fn(),
   } as jest.Mocked<Partial<Writable>> as jest.Mocked<Writable>;
 
-  const mockTmpDir = os.tmpdir();
+  const mockDir = createMockDirectory();
+  const workspacePath = mockDir.resolve('workspace');
+
   const mockContext = {
     input: {},
     baseUrl: 'somebase',
-    workspacePath: mockTmpDir,
+    workspacePath,
     logger: getVoidLogger(),
     logStream,
     output: jest.fn(),
-    createTemporaryDirectory: jest.fn().mockResolvedValue(mockTmpDir),
+    createTemporaryDirectory: jest.fn(),
   };
 
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
-  afterEach(() => {
-    mockFs.restore();
-  });
-
   it('should wait for specified period of time', async () => {
     const context = {
       ...mockContext,