diff --git a/extensions/terminal-suggest/src/test/completions/code.test.ts b/extensions/terminal-suggest/src/test/completions/code.test.ts
index a7b6885f83d..30410825904 100644
--- a/extensions/terminal-suggest/src/test/completions/code.test.ts
+++ b/extensions/terminal-suggest/src/test/completions/code.test.ts
@@ -8,7 +8,52 @@ import codeCompletionSpec from '../../completions/code';
 import { testPaths, type ISuiteSpec, type ITestSpec } from '../helpers';
 import codeInsidersCompletionSpec from '../../completions/code-insiders';
 
-export const codeSpecOptions = ['-', '--add', '--category', '--diff', '--disable-extension', '--disable-extensions', '--disable-gpu', '--enable-proposed-api', '--extensions-dir', '--goto', '--help', '--inspect-brk-extensions', '--inspect-extensions', '--install-extension', '--list-extensions', '--locale', '--locate-shell-integration-path', '--log', '--max-memory', '--merge', '--new-window', '--pre-release', '--prof-startup', '--profile', '--reuse-window', '--show-versions', '--status', '--sync', '--telemetry', '--uninstall-extension', '--user-data-dir', '--verbose', '--version', '--wait', '-a', '-d', '-g', '-h', '-m', '-n', '-r', '-s', '-v', '-w'];
+export const codeSpecOptions = [
+	'-a <folder>',
+	'-d <file> <file>',
+	'-g <file:line[:character]>',
+	'-h',
+	'-m <path1> <path2> <base> <result>',
+	'-n',
+	'-r',
+	'-s',
+	'-v',
+	'-w',
+	'-',
+	'--add <folder>',
+	'--category <category>',
+	'--diff <file> <file>',
+	'--disable-extension <extension-id>',
+	'--disable-extensions',
+	'--disable-gpu',
+	'--enable-proposed-api',
+	'--extensions-dir <dir>',
+	'--goto <file:line[:character]>',
+	'--help',
+	'--inspect-brk-extensions <port>',
+	'--inspect-extensions <port>',
+	'--install-extension <extension-id[@version] | path-to-vsix>',
+	'--list-extensions',
+	'--locale <locale>',
+	'--locate-shell-integration-path <shell>',
+	'--log <level>',
+	'--max-memory <memory>',
+	'--merge <path1> <path2> <base> <result>',
+	'--new-window',
+	'--pre-release',
+	'--prof-startup',
+	'--profile <settingsProfileName>',
+	'--reuse-window',
+	'--show-versions',
+	'--status',
+	'--sync <sync>',
+	'--telemetry',
+	'--uninstall-extension <extension-id>',
+	'--user-data-dir <dir>',
+	'--verbose',
+	'--version',
+	'--wait',
+];
 
 export function createCodeTestSpecs(executable: string): ITestSpec[] {
 	const localeOptions = ['bg', 'de', 'en', 'es', 'fr', 'hu', 'it', 'ja', 'ko', 'pt-br', 'ru', 'tr', 'zh-CN', 'zh-TW'];
diff --git a/extensions/terminal-suggest/src/test/completions/upstream/ls.test.ts b/extensions/terminal-suggest/src/test/completions/upstream/ls.test.ts
index 63ada99f427..aab14e3d5c4 100644
--- a/extensions/terminal-suggest/src/test/completions/upstream/ls.test.ts
+++ b/extensions/terminal-suggest/src/test/completions/upstream/ls.test.ts
@@ -10,7 +10,7 @@ import lsSpec from '../../../completions/upstream/ls';
 const allOptions = [
 	'-%',
 	'-,',
-	'--color',
+	'--color <when>',
 	'-1',
 	'-@',
 	'-A',
diff --git a/extensions/terminal-suggest/src/test/completions/upstream/mkdir.test.ts b/extensions/terminal-suggest/src/test/completions/upstream/mkdir.test.ts
index 3935191e4f0..5daeeb25b3b 100644
--- a/extensions/terminal-suggest/src/test/completions/upstream/mkdir.test.ts
+++ b/extensions/terminal-suggest/src/test/completions/upstream/mkdir.test.ts
@@ -8,14 +8,14 @@ import { testPaths, type ISuiteSpec } from '../../helpers';
 import mkdirSpec from '../../../completions/upstream/mkdir';
 
 const allOptions = [
-	'--context',
+	'--context <CTX>',
 	'--help',
-	'--mode',
+	'--mode <MODE>',
 	'--parents',
 	'--verbose',
 	'--version',
-	'-Z',
-	'-m',
+	'-Z <CTX>',
+	'-m <MODE>',
 	'-p',
 	'-v',
 ];
diff --git a/extensions/terminal-suggest/src/test/completions/upstream/touch.test.ts b/extensions/terminal-suggest/src/test/completions/upstream/touch.test.ts
index 4373025c683..dd03b062154 100644
--- a/extensions/terminal-suggest/src/test/completions/upstream/touch.test.ts
+++ b/extensions/terminal-suggest/src/test/completions/upstream/touch.test.ts
@@ -8,14 +8,14 @@ import { testPaths, type ISuiteSpec } from '../../helpers';
 import touchSpec from '../../../completions/upstream/touch';
 
 const allOptions = [
-	'-A',
+	'-A <time>',
 	'-a',
 	'-c',
 	'-f',
 	'-h',
 	'-m',
-	'-r',
-	'-t',
+	'-r <file>',
+	'-t <timestamp>',
 ];
 const expectedCompletions = [{ label: 'touch', description: (touchSpec as any).description }];
 
diff --git a/extensions/terminal-suggest/src/test/fig.test.ts b/extensions/terminal-suggest/src/test/fig.test.ts
index 915d32d97ea..b8144219e88 100644
--- a/extensions/terminal-suggest/src/test/fig.test.ts
+++ b/extensions/terminal-suggest/src/test/fig.test.ts
@@ -121,7 +121,7 @@ export const figGenericTestSuites: ISuiteSpec[] = [
 		],
 		availableCommands: 'foo',
 		testSpecs: [
-			{ input: 'foo |', expectedCompletions: ['--bar'] },
+			{ input: 'foo |', expectedCompletions: ['--bar <baz>'] },
 			{ input: 'foo --bar |', expectedCompletions: ['a', 'b', 'c'] },
 			{ input: 'foo --bar a|', expectedCompletions: ['a', 'b', 'c'] },
 			{ input: 'foo --bar b|', expectedCompletions: ['a', 'b', 'c'] },
diff --git a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
index b14b6a2c4d3..2baabd83886 100644
--- a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
+++ b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
@@ -106,7 +106,16 @@ suite('Terminal Suggest', () => {
 						undefined,
 						new MockFigExecuteExternals()
 					);
-					deepStrictEqual(result.items.map(i => i.label).sort(), (testSpec.expectedCompletions ?? []).sort());
+					deepStrictEqual(
+						// Add detail to the label if it exists
+						result.items.map(i => {
+							if (typeof i.label === 'object' && i.label.detail) {
+								return `${i.label.label}${i.label.detail}`;
+							}
+							return i.label;
+						}).sort(),
+						(testSpec.expectedCompletions ?? []).sort()
+					);
 					strictEqual(result.filesRequested, filesRequested, 'Files requested different than expected, got: ' + result.filesRequested);
 					strictEqual(result.foldersRequested, foldersRequested, 'Folders requested different than expected, got: ' + result.foldersRequested);
 					if (testSpec.expectedResourceRequests?.cwd) {