diff --git a/packages/jsx-email/src/cli/commands/check.ts b/packages/jsx-email/src/cli/commands/check.ts
index 9fe7c993..6a2f234d 100644
--- a/packages/jsx-email/src/cli/commands/check.ts
+++ b/packages/jsx-email/src/cli/commands/check.ts
@@ -4,7 +4,7 @@ import { type IssueGroup, caniemail, groupIssues, sortIssues } from 'caniemail';
 import chalk from 'chalk';
 import chalkTmpl from 'chalk-template';
 import stripAnsi from 'strip-ansi';
-import { type InferOutput as Infer, parse as assert, object } from 'valibot';
+import { type InferOutput as Infer, parse as assert, boolean, object, optional } from 'valibot';
 
 import { formatBytes, gmailByteLimit, gmailBytesSafe } from '../helpers.js';
 
@@ -13,7 +13,9 @@ import { type CommandFn } from './types.js';
 
 const { error, log } = console;
 
-const CheckOptionsStruct = object({});
+const CheckOptionsStruct = object({
+  usePreviewProps: optional(boolean())
+});
 
 type CheckOptions = Infer<typeof CheckOptionsStruct>;
 
@@ -32,17 +34,24 @@ export const help = chalkTmpl`
 Check jsx-email templates for client compatibility
 
 {underline Usage}
-  $ email check <template file name>
+  $ email check <template file name> [...options]
+
+{underline Options}
+  --use-preview-props
+                When set, use the \`previewProps\` exported by the template file (if present).
 
 {underline Examples}
   $ email check ./emails/Batman.tsx
+  $ email check ./emails/Batman.tsx --use-preview-props
 `;
 
 const formatNotes = (notes: string[], indent: string) => {
   if (!notes.length) return '';
-  const noteLines = (notes as string[]).join(`\n${'.'.repeat(indent.length)}**`);
-  console.log({ noteLines });
-  return chalkTmpl`\n${indent}{cyan Notes}:\n${'.'.repeat(indent.length)}asshole\n`;
+
+  const noteIndent = `${indent}  `;
+  const noteLines = notes.map((note) => `${noteIndent}${chalk.dim(note)}`).join('\n');
+
+  return `\n${indent}${chalk.cyan('Notes')}:\n${noteLines}`;
 };
 
 const formatIssue = (group: IssueGroup): string => {
@@ -129,7 +138,11 @@ export const command: CommandFn = async (argv: CheckOptions, input) => {
   log(chalkTmpl`{blue Checking email template for Client Compatibility...}\n`);
 
   const [file] = await buildTemplates({
-    buildOptions: { showStats: false, writeToFile: false },
+    buildOptions: {
+      showStats: false,
+      usePreviewProps: argv.usePreviewProps,
+      writeToFile: false
+    },
     targetPath: input[0]
   });
 
diff --git a/packages/jsx-email/test/config/define-config.test.ts b/packages/jsx-email/test/config/define-config.test.ts
index 7974cf44..5f6c6660 100644
--- a/packages/jsx-email/test/config/define-config.test.ts
+++ b/packages/jsx-email/test/config/define-config.test.ts
@@ -1,12 +1,40 @@
-import { defineConfig } from '../../src/config.js';
-import { pluginSymbol } from '../../src/plugins.js';
+import { createRequire } from 'node:module';
+import { dirname } from 'node:path';
+
+import loglevelnext from 'loglevelnext';
+
+const require = createRequire(import.meta.url);
 
 describe('defineConfig', async () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    vi.resetModules();
+
+    process.env.FORCE_COLOR = '1';
+
+    const dotLogPath = require.resolve('@dot/log');
+    const chalkPath = require.resolve('chalk', { paths: [dirname(dotLogPath)] });
+
+    delete require.cache[dotLogPath];
+    delete require.cache[chalkPath];
+    require(chalkPath).level = 1;
+
+    delete (globalThis as any)[Symbol.for('jsx-email/global/config')];
+    delete process.env.DOT_LOG_LEVEL;
+
+    for (const key of Object.keys(loglevelnext.loggers)) {
+      if (key === 'default') continue;
+      delete loglevelnext.loggers[key];
+    }
+  });
+
   test('defaults', async () => {
+    const { defineConfig } = await import('../../src/config.js');
     expect(await defineConfig({})).toMatchSnapshot();
   });
 
   test('basic set', async () => {
+    const { defineConfig } = await import('../../src/config.js');
     const config = await defineConfig({
       render: {
         minify: true
@@ -16,6 +44,7 @@ describe('defineConfig', async () => {
   });
 
   test('minify and pretty', async () => {
+    const { defineConfig } = await import('../../src/config.js');
     const config = await defineConfig({
       render: {
         minify: true,
@@ -26,6 +55,7 @@ describe('defineConfig', async () => {
   });
 
   test('plain', async () => {
+    const { defineConfig } = await import('../../src/config.js');
     const config = await defineConfig({
       render: {
         minify: true,
@@ -37,6 +67,8 @@ describe('defineConfig', async () => {
   });
 
   test('de-dupe plugins', async () => {
+    const { defineConfig } = await import('../../src/config.js');
+    const { pluginSymbol } = await import('../../src/plugins.js');
     const plugin = { name: 'batman', symbol: pluginSymbol };
     const config = await defineConfig({
       plugins: [plugin as any, plugin]
diff --git a/packages/jsx-email/test/config/load/dotdir/load-dotdir.test.ts b/packages/jsx-email/test/config/load/dotdir/load-dotdir.test.ts
index b3313eb3..8b77ab3c 100644
--- a/packages/jsx-email/test/config/load/dotdir/load-dotdir.test.ts
+++ b/packages/jsx-email/test/config/load/dotdir/load-dotdir.test.ts
@@ -1,7 +1,35 @@
-import { loadConfig } from '../../../../src/config.js';
+import { createRequire } from 'node:module';
+import { dirname } from 'node:path';
+
+import loglevelnext from 'loglevelnext';
+
+const require = createRequire(import.meta.url);
 
 describe('loadConfig → dotdir', async () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    vi.resetModules();
+
+    process.env.FORCE_COLOR = '1';
+
+    const dotLogPath = require.resolve('@dot/log');
+    const chalkPath = require.resolve('chalk', { paths: [dirname(dotLogPath)] });
+
+    delete require.cache[dotLogPath];
+    delete require.cache[chalkPath];
+    require(chalkPath).level = 1;
+
+    delete (globalThis as any)[Symbol.for('jsx-email/global/config')];
+    delete process.env.DOT_LOG_LEVEL;
+
+    for (const key of Object.keys(loglevelnext.loggers)) {
+      if (key === 'default') continue;
+      delete loglevelnext.loggers[key];
+    }
+  });
+
   test('loadConfig', async () => {
+    const { loadConfig } = await import('../../../../src/config.js');
     const config = await loadConfig(__dirname);
     expect(config).toMatchSnapshot();
   });
diff --git a/packages/jsx-email/test/config/load/mjs-json/load-mjs-json.test.ts b/packages/jsx-email/test/config/load/mjs-json/load-mjs-json.test.ts
index 4c3e4c38..7dc3bf40 100644
--- a/packages/jsx-email/test/config/load/mjs-json/load-mjs-json.test.ts
+++ b/packages/jsx-email/test/config/load/mjs-json/load-mjs-json.test.ts
@@ -1,7 +1,35 @@
-import { loadConfig } from '../../../../src/config.js';
+import { createRequire } from 'node:module';
+import { dirname } from 'node:path';
+
+import loglevelnext from 'loglevelnext';
+
+const require = createRequire(import.meta.url);
 
 describe('loadConfig → mjs-json', async () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    vi.resetModules();
+
+    process.env.FORCE_COLOR = '1';
+
+    const dotLogPath = require.resolve('@dot/log');
+    const chalkPath = require.resolve('chalk', { paths: [dirname(dotLogPath)] });
+
+    delete require.cache[dotLogPath];
+    delete require.cache[chalkPath];
+    require(chalkPath).level = 1;
+
+    delete (globalThis as any)[Symbol.for('jsx-email/global/config')];
+    delete process.env.DOT_LOG_LEVEL;
+
+    for (const key of Object.keys(loglevelnext.loggers)) {
+      if (key === 'default') continue;
+      delete loglevelnext.loggers[key];
+    }
+  });
+
   test('loadConfig', async () => {
+    const { loadConfig } = await import('../../../../src/config.js');
     const config = await loadConfig(__dirname);
     expect(config).toMatchSnapshot();
   });
diff --git a/packages/jsx-email/test/config/load/mjs/load-mjs.test.ts b/packages/jsx-email/test/config/load/mjs/load-mjs.test.ts
index 0f21ebed..fc3b76c4 100644
--- a/packages/jsx-email/test/config/load/mjs/load-mjs.test.ts
+++ b/packages/jsx-email/test/config/load/mjs/load-mjs.test.ts
@@ -1,7 +1,35 @@
-import { loadConfig } from '../../../../src/config.js';
+import { createRequire } from 'node:module';
+import { dirname } from 'node:path';
+
+import loglevelnext from 'loglevelnext';
+
+const require = createRequire(import.meta.url);
 
 describe('loadConfig → mjs', async () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    vi.resetModules();
+
+    process.env.FORCE_COLOR = '1';
+
+    const dotLogPath = require.resolve('@dot/log');
+    const chalkPath = require.resolve('chalk', { paths: [dirname(dotLogPath)] });
+
+    delete require.cache[dotLogPath];
+    delete require.cache[chalkPath];
+    require(chalkPath).level = 1;
+
+    delete (globalThis as any)[Symbol.for('jsx-email/global/config')];
+    delete process.env.DOT_LOG_LEVEL;
+
+    for (const key of Object.keys(loglevelnext.loggers)) {
+      if (key === 'default') continue;
+      delete loglevelnext.loggers[key];
+    }
+  });
+
   test('loadConfig', async () => {
+    const { loadConfig } = await import('../../../../src/config.js');
     const config = await loadConfig(__dirname);
     expect(config).toMatchSnapshot();
   });
diff --git a/packages/jsx-email/test/config/load/parent-dir/child-dir/parent-dir.test.ts b/packages/jsx-email/test/config/load/parent-dir/child-dir/parent-dir.test.ts
index 9494007a..41798d4d 100644
--- a/packages/jsx-email/test/config/load/parent-dir/child-dir/parent-dir.test.ts
+++ b/packages/jsx-email/test/config/load/parent-dir/child-dir/parent-dir.test.ts
@@ -1,7 +1,35 @@
-import { loadConfig } from '../../../../../src/config.js';
+import { createRequire } from 'node:module';
+import { dirname } from 'node:path';
+
+import loglevelnext from 'loglevelnext';
+
+const require = createRequire(import.meta.url);
 
 describe('loadConfig → parent dir', async () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    vi.resetModules();
+
+    process.env.FORCE_COLOR = '1';
+
+    const dotLogPath = require.resolve('@dot/log');
+    const chalkPath = require.resolve('chalk', { paths: [dirname(dotLogPath)] });
+
+    delete require.cache[dotLogPath];
+    delete require.cache[chalkPath];
+    require(chalkPath).level = 1;
+
+    delete (globalThis as any)[Symbol.for('jsx-email/global/config')];
+    delete process.env.DOT_LOG_LEVEL;
+
+    for (const key of Object.keys(loglevelnext.loggers)) {
+      if (key === 'default') continue;
+      delete loglevelnext.loggers[key];
+    }
+  });
+
   test('loadConfig', async () => {
+    const { loadConfig } = await import('../../../../../src/config.js');
     const config = await loadConfig(__dirname);
     expect(config).toBeDefined();
     expect(config).toMatchSnapshot();
diff --git a/test/cli/check.test.ts b/test/cli/check.test.ts
new file mode 100644
index 00000000..84fe5722
--- /dev/null
+++ b/test/cli/check.test.ts
@@ -0,0 +1,31 @@
+import { resolve } from 'node:path';
+
+import { execa } from 'execa';
+import strip from 'strip-ansi';
+import { describe, expect, test } from 'vitest';
+
+process.chdir(__dirname);
+
+describe('cli', async () => {
+  test('email check supports --use-preview-props', async () => {
+    const templatePath = resolve(__dirname, './fixtures/check-preview-props.tsx');
+
+    await expect(
+      execa({ cwd: __dirname, shell: true })`email check ${templatePath}`
+    ).rejects.toMatchObject({
+      exitCode: 1
+    });
+
+    const { stdout } = await execa({
+      cwd: __dirname,
+      shell: true
+    })`email check ${templatePath} --use-preview-props`;
+
+    const plain = strip(stdout);
+
+    expect(plain).toContain('Checking email template for Client Compatibility');
+    expect(plain).toContain('Check Complete');
+    expect(plain).not.toContain('noteLines');
+    expect(plain).not.toContain('asshole');
+  });
+});
diff --git a/test/cli/fixtures/check-preview-props.tsx b/test/cli/fixtures/check-preview-props.tsx
new file mode 100644
index 00000000..056b3117
--- /dev/null
+++ b/test/cli/fixtures/check-preview-props.tsx
@@ -0,0 +1,9 @@
+interface PreviewProps {
+  label: string;
+}
+
+export const previewProps: PreviewProps = {
+  label: 'Preview props loaded'
+};
+
+export const Template = ({ label }: PreviewProps) => <div>{label.toUpperCase()}</div>;
diff --git a/test/cli/moon.yml b/test/cli/moon.yml
index 2653b57e..a572ea0f 100644
--- a/test/cli/moon.yml
+++ b/test/cli/moon.yml
@@ -9,6 +9,12 @@ tasks:
   # Naming this differently so it's not picked up bu the main test workflow
   test.run:
     command: vitest --config ../../shared/vitest.config.ts . --pool=forks
+    deps:
+      - plugin-inline:build
+      - plugin-minify:build
+      - plugin-pretty:build
+      - create-mail:build
+      - jsx-email:build
     inputs:
       - ./**/*.test.ts
       - package.json