diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
index 15beae61f25..6c120e30349 100644
--- a/src/testRunner/tsconfig.json
+++ b/src/testRunner/tsconfig.json
@@ -116,6 +116,7 @@
         "unittests/tsbuild/watchMode.ts",
         "unittests/tsc/declarationEmit.ts",
         "unittests/tsc/incremental.ts",
+        "unittests/tsc/listFilesOnly.ts",
         "unittests/tscWatch/consoleClearing.ts",
         "unittests/tscWatch/emit.ts",
         "unittests/tscWatch/emitAndErrorUpdates.ts",
diff --git a/src/testRunner/unittests/tsc/listFilesOnly.ts b/src/testRunner/unittests/tsc/listFilesOnly.ts
new file mode 100644
index 00000000000..07b3b25c467
--- /dev/null
+++ b/src/testRunner/unittests/tsc/listFilesOnly.ts
@@ -0,0 +1,33 @@
+namespace ts {
+    describe("unittests:: tsc:: listFilesOnly::", () => {
+        verifyTsc({
+            scenario: "listFilesOnly",
+            subScenario: "before watch",
+            fs: () => loadProjectFromFiles({
+                "/src/test.ts": utils.dedent`
+                        export const x = 1;`,
+            }),
+            commandLineArgs: ["/src/test.ts", "--listFilesOnly", "--watch"]
+        });
+
+        verifyTsc({
+            scenario: "listFilesOnly",
+            subScenario: "after watch",
+            fs: () => loadProjectFromFiles({
+                "/src/test.ts": utils.dedent`
+                        export const x = 1;`,
+            }),
+            commandLineArgs: ["/src/test.ts", "--watch", "--listFilesOnly"]
+        });
+
+        verifyTsc({
+            scenario: "listFilesOnly",
+            subScenario: "loose file",
+            fs: () => loadProjectFromFiles({
+                "/src/test.ts": utils.dedent`
+                        export const x = 1;`,
+            }),
+            commandLineArgs: ["/src/test.ts", "--listFilesOnly"]
+        });
+    });
+}
diff --git a/tests/baselines/reference/tsc/listFilesOnly/initial-build/after-watch.js b/tests/baselines/reference/tsc/listFilesOnly/initial-build/after-watch.js
new file mode 100644
index 00000000000..7ef3574626b
--- /dev/null
+++ b/tests/baselines/reference/tsc/listFilesOnly/initial-build/after-watch.js
@@ -0,0 +1,6 @@
+//// [/lib/initial-buildOutput.txt]
+/lib/tsc /src/test.ts --watch --listFilesOnly
+error TS6370: Options 'watch' and 'listFilesOnly' cannot be combined.
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+
+
diff --git a/tests/baselines/reference/tsc/listFilesOnly/initial-build/before-watch.js b/tests/baselines/reference/tsc/listFilesOnly/initial-build/before-watch.js
new file mode 100644
index 00000000000..c88653ae43b
--- /dev/null
+++ b/tests/baselines/reference/tsc/listFilesOnly/initial-build/before-watch.js
@@ -0,0 +1,6 @@
+//// [/lib/initial-buildOutput.txt]
+/lib/tsc /src/test.ts --listFilesOnly --watch
+error TS6370: Options 'watch' and 'listFilesOnly' cannot be combined.
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+
+
diff --git a/tests/baselines/reference/tsc/listFilesOnly/initial-build/loose-file.js b/tests/baselines/reference/tsc/listFilesOnly/initial-build/loose-file.js
new file mode 100644
index 00000000000..6a97401e560
--- /dev/null
+++ b/tests/baselines/reference/tsc/listFilesOnly/initial-build/loose-file.js
@@ -0,0 +1,7 @@
+//// [/lib/initial-buildOutput.txt]
+/lib/tsc /src/test.ts --listFilesOnly
+/lib/lib.d.ts
+/src/test.ts
+exitCode:: ExitStatus.Success
+
+
diff --git a/tests/cases/fourslash/listFilesOnly.ts b/tests/cases/fourslash/listFilesOnly.ts
deleted file mode 100644
index 63e2ba19407..00000000000
--- a/tests/cases/fourslash/listFilesOnly.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// @listFilesOnly: true
-
-// @Filename: a.js
-////const x = 1;
-
-// Just want to see that no baseline is emitted
-
-verify.noErrors();
\ No newline at end of file