diff --git a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js
index d14396154bed..bdf33eef1fb4 100644
--- a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js
+++ b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js
@@ -23,16 +23,13 @@ import '../../../../lib/test'
 import { files } from '../../../generate/cell/cell'
 import { tasks } from '../cell'
 
-beforeEach(() => {
-  fs.__setMockFiles(files({ name: 'User' }))
-})
-
 afterEach(() => {
   fs.__setMockFiles({})
   jest.spyOn(fs, 'unlinkSync').mockClear()
 })
 
 test('destroys cell files', async () => {
+  fs.__setMockFiles(await files({ name: 'User' }))
   const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
   const t = tasks({
     componentName: 'cell',
@@ -41,15 +38,15 @@ test('destroys cell files', async () => {
   })
   t.setRenderer('silent')
 
-  return t.run().then(() => {
-    const generatedFiles = Object.keys(files({ name: 'User' }))
-    expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
-    generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
-  })
+  await t.run()
+
+  const generatedFiles = Object.keys(await files({ name: 'User' }))
+  expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
+  generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
 })
 
 test('destroys cell files with stories and tests', async () => {
-  fs.__setMockFiles(files({ name: 'User', stories: true, tests: true }))
+  fs.__setMockFiles(await files({ name: 'User', stories: true, tests: true }))
   const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
   const t = tasks({
     componentName: 'cell',
@@ -60,11 +57,11 @@ test('destroys cell files with stories and tests', async () => {
   })
   t.setRenderer('silent')
 
-  return t.run().then(() => {
-    const generatedFiles = Object.keys(
-      files({ name: 'User', stories: true, tests: true })
-    )
-    expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
-    generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
-  })
+  await t.run()
+
+  const generatedFiles = Object.keys(
+    await files({ name: 'User', stories: true, tests: true })
+  )
+  expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
+  generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
 })
diff --git a/packages/cli/src/commands/destroy/function/__tests__/function.test.js b/packages/cli/src/commands/destroy/function/__tests__/function.test.js
index 16471456acfa..298ee2bb61a0 100644
--- a/packages/cli/src/commands/destroy/function/__tests__/function.test.js
+++ b/packages/cli/src/commands/destroy/function/__tests__/function.test.js
@@ -15,7 +15,7 @@ import { files } from '../../../generate/function/function'
 import { tasks } from '../function'
 
 beforeEach(async () => {
-  fs.__setMockFiles(await files({ name: 'sendMail' }))
+  fs.__setMockFiles(files({ name: 'sendMail' }))
 })
 
 afterEach(() => {
@@ -33,7 +33,7 @@ test('destroys service files', async () => {
   t.setRenderer('silent')
 
   return t.run().then(async () => {
-    const generatedFiles = Object.keys(await files({ name: 'sendMail' }))
+    const generatedFiles = Object.keys(files({ name: 'sendMail' }))
     expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
     generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
   })