diff --git a/__fixtures__/test-project/web/src/components/BlogPostsCell/BlogPostsCell.test.tsx b/__fixtures__/test-project/web/src/components/BlogPostsCell/BlogPostsCell.test.tsx
index 74226b90435d..223be46186c9 100644
--- a/__fixtures__/test-project/web/src/components/BlogPostsCell/BlogPostsCell.test.tsx
+++ b/__fixtures__/test-project/web/src/components/BlogPostsCell/BlogPostsCell.test.tsx
@@ -24,7 +24,7 @@ describe('BlogPostsCell', () => {
 
   it('renders Failure successfully', async () => {
     expect(() => {
-      render(<Failure id={42} error={new Error('Oh no')} />)
+      render(<Failure error={new Error('Oh no')} />)
     }).not.toThrow()
   })
 
@@ -36,7 +36,7 @@ describe('BlogPostsCell', () => {
 
   it('renders Success successfully', async () => {
     expect(() => {
-      render(<Success id={42} blogPosts={standard().blogPosts} />)
+      render(<Success blogPosts={standard().blogPosts} />)
     }).not.toThrow()
   })
 })
diff --git a/packages/cli/src/commands/generate/cell/__tests__/__snapshots__/cell.test.js.snap b/packages/cli/src/commands/generate/cell/__tests__/__snapshots__/cell.test.js.snap
index 7e01dbb93fc1..3a2962543872 100644
--- a/packages/cli/src/commands/generate/cell/__tests__/__snapshots__/cell.test.js.snap
+++ b/packages/cli/src/commands/generate/cell/__tests__/__snapshots__/cell.test.js.snap
@@ -166,7 +166,7 @@ describe('CustomIdFieldsCell', () => {
 
   it('renders Failure successfully', async () => {
     expect(() => {
-      render(<Failure uuid={'42'} error={new Error('Oh no')} />)
+      render(<Failure error={new Error('Oh no')} />)
     }).not.toThrow()
   })
 
@@ -178,7 +178,7 @@ describe('CustomIdFieldsCell', () => {
 
   it('renders Success successfully', async () => {
     expect(() => {
-      render(<Success uuid={'42'} customIdFields={standard().customIdFields} />)
+      render(<Success customIdFields={standard().customIdFields} />)
     }).not.toThrow()
   })
 })
@@ -1232,7 +1232,7 @@ describe('AddressesCell', () => {
 
   it('renders Failure successfully', async () => {
     expect(() => {
-      render(<Failure id={'42'} error={new Error('Oh no')} />)
+      render(<Failure error={new Error('Oh no')} />)
     }).not.toThrow()
   })
 
@@ -1244,7 +1244,7 @@ describe('AddressesCell', () => {
 
   it('renders Success successfully', async () => {
     expect(() => {
-      render(<Success id={'42'} addresses={standard().addresses} />)
+      render(<Success addresses={standard().addresses} />)
     }).not.toThrow()
   })
 })
@@ -1365,7 +1365,7 @@ describe('MembersCell', () => {
 
   it('renders Failure successfully', async () => {
     expect(() => {
-      render(<Failure id={42} error={new Error('Oh no')} />)
+      render(<Failure error={new Error('Oh no')} />)
     }).not.toThrow()
   })
 
@@ -1377,7 +1377,7 @@ describe('MembersCell', () => {
 
   it('renders Success successfully', async () => {
     expect(() => {
-      render(<Success id={42} members={standard().members} />)
+      render(<Success members={standard().members} />)
     }).not.toThrow()
   })
 })
diff --git a/packages/cli/src/commands/generate/cell/cell.js b/packages/cli/src/commands/generate/cell/cell.js
index 6030e9591748..b644fe7c9cc6 100644
--- a/packages/cli/src/commands/generate/cell/cell.js
+++ b/packages/cli/src/commands/generate/cell/cell.js
@@ -101,8 +101,8 @@ export const files = async ({ name, typescript, ...options }) => {
     generator: 'cell',
     templatePath: 'test.js.template',
     templateVars: {
-      idName,
-      mockIdValues,
+      idName: shouldGenerateList ? undefined : idName,
+      mockIdValues: shouldGenerateList ? undefined : mockIdValues,
     },
   })